From 73b96ed949ea8e7a3ec6af0e6c1276ba5656af18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Fri, 3 Jul 2026 17:16:18 +0200 Subject: [PATCH 1/4] SOLR-18297 Upgrade Jetty to 12.1.10 (#4574) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migrate server/etc/jetty.xml to deploy Solr’s single webapp directly (remove server/contexts/solr-jetty-context.xml). Adapt code/tests for Jetty 12.1 API/behavior changes (HTTP client transport API changes; proxy request/response framing; RuntimeIOException removal). (cherry picked from commit bb8c68b67a81467ff925dab4b637d623e7d289b3) --- .../SOLR-18297-update-jetty-12.1.10.yml | 7 ++ gradle/libs.versions.toml | 2 +- solr/api/gradle.lockfile | 38 ++++----- solr/benchmark/gradle.lockfile | 38 ++++----- solr/core/gradle.lockfile | 38 ++++----- .../java/org/apache/solr/core/SolrCore.java | 4 +- .../org/apache/solr/handler/CatStream.java | 4 +- .../container/JettyBridgeResponseWriter.java | 5 +- .../apache/solr/servlet/HttpSolrProxy.java | 20 ++++- solr/cross-dc-manager/gradle.lockfile | 50 ++++++------ .../jetty-alpn-client-12.0.34.jar.sha1 | 1 - .../jetty-alpn-client-12.1.10.jar.sha1 | 1 + .../jetty-alpn-java-client-12.0.34.jar.sha1 | 1 - .../jetty-alpn-java-client-12.1.10.jar.sha1 | 1 + .../jetty-alpn-java-server-12.0.34.jar.sha1 | 1 - .../jetty-alpn-java-server-12.1.10.jar.sha1 | 1 + .../jetty-alpn-server-12.0.34.jar.sha1 | 1 - .../jetty-alpn-server-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-client-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-client-12.1.10.jar.sha1 | 1 + .../jetty-compression-common-12.1.10.jar.sha1 | 1 + .../jetty-compression-gzip-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-deploy-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-deploy-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-ee-12.0.34.jar.sha1 | 1 - .../licenses/jetty-ee-webapp-12.1.10.jar.sha1 | 1 + .../jetty-ee10-servlet-12.0.34.jar.sha1 | 1 - .../jetty-ee10-servlet-12.1.10.jar.sha1 | 1 + .../jetty-ee10-servlets-12.0.34.jar.sha1 | 1 - .../jetty-ee10-servlets-12.1.10.jar.sha1 | 1 + .../jetty-ee10-webapp-12.0.34.jar.sha1 | 1 - .../jetty-ee10-webapp-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-http-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-http-12.1.10.jar.sha1 | 1 + .../jetty-http2-client-12.0.34.jar.sha1 | 1 - .../jetty-http2-client-12.1.10.jar.sha1 | 1 + ...ty-http2-client-transport-12.0.34.jar.sha1 | 1 - ...ty-http2-client-transport-12.1.10.jar.sha1 | 1 + .../jetty-http2-common-12.0.34.jar.sha1 | 1 - .../jetty-http2-common-12.1.10.jar.sha1 | 1 + .../jetty-http2-hpack-12.0.34.jar.sha1 | 1 - .../jetty-http2-hpack-12.1.10.jar.sha1 | 1 + .../jetty-http2-server-12.0.34.jar.sha1 | 1 - .../jetty-http2-server-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-io-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-io-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-jmx-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-jmx-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-rewrite-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-rewrite-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-security-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-security-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-server-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-server-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-session-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-session-12.1.10.jar.sha1 | 1 + .../jetty-start-12.0.34-shaded.jar.sha1 | 1 - .../jetty-start-12.1.10-shaded.jar.sha1 | 1 + solr/licenses/jetty-util-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-util-12.1.10.jar.sha1 | 1 + solr/licenses/jetty-xml-12.0.34.jar.sha1 | 1 - solr/licenses/jetty-xml-12.1.10.jar.sha1 | 1 + solr/modules/analysis-extras/gradle.lockfile | 38 ++++----- solr/modules/clustering/gradle.lockfile | 38 ++++----- solr/modules/cross-dc/gradle.lockfile | 38 ++++----- solr/modules/cuvs/gradle.lockfile | 38 ++++----- solr/modules/extraction/gradle.lockfile | 38 ++++----- solr/modules/gcs-repository/gradle.lockfile | 38 ++++----- solr/modules/jwt-auth/gradle.lockfile | 38 ++++----- solr/modules/langid/gradle.lockfile | 38 ++++----- solr/modules/language-models/gradle.lockfile | 38 ++++----- solr/modules/ltr/gradle.lockfile | 38 ++++----- solr/modules/opentelemetry/gradle.lockfile | 38 ++++----- solr/modules/s3-repository/gradle.lockfile | 38 ++++----- solr/modules/scripting/gradle.lockfile | 38 ++++----- solr/modules/sql/gradle.lockfile | 38 ++++----- solr/packaging/test/test_start_solr.bats | 14 ++++ solr/server/contexts/solr-jetty-context.xml | 51 ------------ solr/server/etc/jetty.xml | 77 ++++++++++--------- solr/server/gradle.lockfile | 52 +++++++------ solr/solr-ref-guide/gradle.lockfile | 38 ++++----- .../pages/major-changes-in-solr-10.adoc | 8 ++ solr/solrj-jetty/gradle.lockfile | 38 ++++----- .../HttpJettySolrClientCompatibilityTest.java | 15 ++-- solr/solrj-streaming/gradle.lockfile | 38 ++++----- solr/solrj-zookeeper/gradle.lockfile | 38 ++++----- solr/solrj/gradle.lockfile | 44 ++++++----- solr/test-framework/gradle.lockfile | 38 ++++----- solr/webapp/gradle.lockfile | 50 ++++++------ 89 files changed, 675 insertions(+), 616 deletions(-) create mode 100644 changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml delete mode 100644 solr/licenses/jetty-alpn-client-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-client-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-java-client-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-java-server-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-server-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-server-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-client-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-client-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-compression-common-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-deploy-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-deploy-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-ee-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-ee10-servlet-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-ee10-servlets-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-ee10-webapp-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-http-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-http-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-http2-client-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-http2-client-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-http2-client-transport-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-http2-common-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-http2-common-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-http2-hpack-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-http2-server-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-http2-server-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-io-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-io-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-jmx-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-jmx-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-rewrite-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-rewrite-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-security-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-security-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-server-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-server-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-session-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-session-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-start-12.0.34-shaded.jar.sha1 create mode 100644 solr/licenses/jetty-start-12.1.10-shaded.jar.sha1 delete mode 100644 solr/licenses/jetty-util-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-util-12.1.10.jar.sha1 delete mode 100644 solr/licenses/jetty-xml-12.0.34.jar.sha1 create mode 100644 solr/licenses/jetty-xml-12.1.10.jar.sha1 delete mode 100644 solr/server/contexts/solr-jetty-context.xml diff --git a/changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml b/changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml new file mode 100644 index 000000000000..4d9a12221760 --- /dev/null +++ b/changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml @@ -0,0 +1,7 @@ +title: Upgrade Eclipse Jetty to 12.1.10 +type: dependency_update +authors: + - name: Jan Høydahl +links: + - name: SOLR-18297 + url: https://issues.apache.org/jira/browse/SOLR-18297 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0c7bfa04e1f8..d3dda1c5d395 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.0.34" +eclipse-jetty = "12.1.10" # @keep jgit version used by git-status.gradle eclipse-jgit = "7.7.1.202607240634-r" fasterxml = "2.22.3" diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index 0d0e10774868..bb6ffce2fae5 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -126,24 +126,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=jarValidation,testCompileClasspath,tes org.apache.zookeeper:zookeeper:3.9.6=jarValidation,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index bc560d9c162e..cc04c779e0a1 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -116,24 +116,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,runtimeClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index 58d8c0bd30c4..aa8a49874d4e 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -133,24 +133,26 @@ org.carrot2:morfologik-fsa:2.1.9=jarValidation,testRuntimeClasspath org.carrot2:morfologik-polish:2.1.9=jarValidation,testRuntimeClasspath org.carrot2:morfologik-stemming:2.1.9=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java index 75175089b0ca..c3e41393ab75 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java +++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java @@ -32,6 +32,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; +import java.io.UncheckedIOException; import java.io.Writer; import java.lang.invoke.MethodHandles; import java.lang.reflect.Constructor; @@ -169,7 +170,6 @@ import org.apache.solr.util.stats.MetricUtils; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.data.Stat; -import org.eclipse.jetty.io.RuntimeIOException; import org.glassfish.jersey.server.ApplicationHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -529,7 +529,7 @@ public int getSegmentCount() { return withSearcher( solrIndexSearcher -> solrIndexSearcher.getRawReader().getIndexCommit().getSegmentCount()); } catch (IOException e) { - throw new RuntimeIOException(e); + throw new UncheckedIOException(e); } } diff --git a/solr/core/src/java/org/apache/solr/handler/CatStream.java b/solr/core/src/java/org/apache/solr/handler/CatStream.java index fdffe29e6c07..ae72ad32abfa 100644 --- a/solr/core/src/java/org/apache/solr/handler/CatStream.java +++ b/solr/core/src/java/org/apache/solr/handler/CatStream.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.InputStreamReader; +import java.io.UncheckedIOException; import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -42,7 +43,6 @@ import org.apache.solr.common.SolrException; import org.apache.solr.common.util.StrUtils; import org.apache.solr.core.SolrCore; -import org.eclipse.jetty.io.RuntimeIOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -249,7 +249,7 @@ private void findReadableFiles(CrawlFile seed, List foundFiles) { findReadableFiles(new CrawlFile(itemDisplayPath, iPath), foundFiles); }); } catch (IOException e) { - throw new RuntimeIOException(e); + throw new UncheckedIOException(e); } } } diff --git a/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java b/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java index 8e1e83c7c02d..eddd237c84b9 100644 --- a/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java @@ -53,8 +53,9 @@ public OutputStream writeResponseStatusAndHeaders( final StatusType statusInfo = context.getStatusInfo(); httpServletResponse.setStatus(statusInfo.getStatusCode()); - if (contentLength != -1 && contentLength < Integer.MAX_VALUE) { - httpServletResponse.setContentLength((int) contentLength); + // Note: don't propagate if 0 length: V2HttpCall does an empty first pass + if (contentLength > 0) { + httpServletResponse.setContentLengthLong(contentLength); } for (final Map.Entry> e : context.getStringHeaders().entrySet()) { for (final String value : e.getValue()) { diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrProxy.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrProxy.java index 153a97d36eda..3c57062906f4 100644 --- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrProxy.java +++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrProxy.java @@ -41,6 +41,10 @@ class HttpSolrProxy { // TODO add X-Forwarded-For and with comma delimited + // Headers stripped when copying in either direction. Hop-by-hop headers, plus Host (not + // hop-by-hop, but the client must re-derive it for the upstream, else Jetty 12.1 rejects a + // mismatched Host with a 400). See Jetty's reference proxy for comparison: + // https://github.com/jetty/jetty.project/blob/jetty-12.1.x/jetty-ee11/jetty-ee11-proxy/src/main/java/org/eclipse/jetty/ee11/proxy/AbstractProxyServlet.java private static final Set HOP_BY_HOP_HEADERS = EnumSet.of( HttpHeader.CONNECTION, @@ -49,7 +53,8 @@ class HttpSolrProxy { HttpHeader.PROXY_AUTHORIZATION, HttpHeader.TE, HttpHeader.TRANSFER_ENCODING, - HttpHeader.UPGRADE); + HttpHeader.UPGRADE, + HttpHeader.HOST); // Methods that shouldn't have a body according to HTTP spec private static final Set NO_BODY_METHODS = Set.of("GET", "HEAD", "DELETE"); @@ -71,8 +76,15 @@ static void doHttpProxy( // https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/main/instrumentation/jetty-httpclient/jetty-httpclient-12.0 if (!NO_BODY_METHODS.contains(servletReq.getMethod())) { + // Report the known body length so the client sets Content-Length upstream (mirrors Jetty's + // ProxyInputStreamRequestContent); -1 (chunked request in) stays chunked. proxyReq.body( - new InputStreamRequestContent(servletReq.getContentType(), servletReq.getInputStream())); + new InputStreamRequestContent(servletReq.getContentType(), servletReq.getInputStream()) { + @Override + public long getLength() { + return servletReq.getContentLengthLong(); + } + }); } CompletableFuture resultFuture = new CompletableFuture<>(); @@ -131,7 +143,9 @@ private static void copyRequestHeaders( .forEachRemaining( headerName -> { HttpHeader knownHeader = HttpHeader.CACHE.get(headerName); // maybe null - if (!HOP_BY_HOP_HEADERS.contains(knownHeader)) { + // Strip Content-Length too; it's supplied by the request body's getLength() above. + if (!HOP_BY_HOP_HEADERS.contains(knownHeader) + && knownHeader != HttpHeader.CONTENT_LENGTH) { servletReq .getHeaders(headerName) .asIterator() diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index aa1a61bb500e..26aa3131b478 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -137,30 +137,32 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.34=solrPlatformLibs -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.34=solrPlatformLibs -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-deploy:12.0.34=solrPlatformLibs -org.eclipse.jetty:jetty-ee:12.0.34=solrPlatformLibs -org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-jmx:12.0.34=solrPlatformLibs -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-xml:12.0.34=solrPlatformLibs +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.10=solrPlatformLibs +org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=solrPlatformLibs +org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=solrPlatformLibs +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-deploy:12.1.10=solrPlatformLibs +org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-jmx:12.1.10=solrPlatformLibs +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-xml:12.1.10=solrPlatformLibs org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/licenses/jetty-alpn-client-12.0.34.jar.sha1 b/solr/licenses/jetty-alpn-client-12.0.34.jar.sha1 deleted file mode 100644 index 661b0bb61bec..000000000000 --- a/solr/licenses/jetty-alpn-client-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2a9136aee49af9372006943409410adaa5ec09e5 diff --git a/solr/licenses/jetty-alpn-client-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-client-12.1.10.jar.sha1 new file mode 100644 index 000000000000..f8082f4312fd --- /dev/null +++ b/solr/licenses/jetty-alpn-client-12.1.10.jar.sha1 @@ -0,0 +1 @@ +94ab4407094de3ce38133d13ab59780498d3c90c diff --git a/solr/licenses/jetty-alpn-java-client-12.0.34.jar.sha1 b/solr/licenses/jetty-alpn-java-client-12.0.34.jar.sha1 deleted file mode 100644 index 9405168643d6..000000000000 --- a/solr/licenses/jetty-alpn-java-client-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d30aa169971cbe2b653ae7dd807020064a364d16 diff --git a/solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1 new file mode 100644 index 000000000000..3149bd049587 --- /dev/null +++ b/solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1 @@ -0,0 +1 @@ +2af3d913959286bfb414162fe7aa0ef0faa72d38 diff --git a/solr/licenses/jetty-alpn-java-server-12.0.34.jar.sha1 b/solr/licenses/jetty-alpn-java-server-12.0.34.jar.sha1 deleted file mode 100644 index 56964c5122e9..000000000000 --- a/solr/licenses/jetty-alpn-java-server-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b80c9defcfe4288cffeb38eaff4f23d97dfcd2b diff --git a/solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1 new file mode 100644 index 000000000000..54f26378b8d7 --- /dev/null +++ b/solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1 @@ -0,0 +1 @@ +4724aedc068a3ac0f465d343d5afea10455a70b1 diff --git a/solr/licenses/jetty-alpn-server-12.0.34.jar.sha1 b/solr/licenses/jetty-alpn-server-12.0.34.jar.sha1 deleted file mode 100644 index 301c68ee95b8..000000000000 --- a/solr/licenses/jetty-alpn-server-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3e23515e6a82c84551711ca97c70f86dc2ae55fa diff --git a/solr/licenses/jetty-alpn-server-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-server-12.1.10.jar.sha1 new file mode 100644 index 000000000000..f8ec9e359d65 --- /dev/null +++ b/solr/licenses/jetty-alpn-server-12.1.10.jar.sha1 @@ -0,0 +1 @@ +69e9e69f93b1807ed6a7e06b500d0ba1fa998124 diff --git a/solr/licenses/jetty-client-12.0.34.jar.sha1 b/solr/licenses/jetty-client-12.0.34.jar.sha1 deleted file mode 100644 index b22a4094660c..000000000000 --- a/solr/licenses/jetty-client-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ace959f7461ebcff48e72fd86056c587b9bfbb3a diff --git a/solr/licenses/jetty-client-12.1.10.jar.sha1 b/solr/licenses/jetty-client-12.1.10.jar.sha1 new file mode 100644 index 000000000000..ddfc6823e9da --- /dev/null +++ b/solr/licenses/jetty-client-12.1.10.jar.sha1 @@ -0,0 +1 @@ +5388ae528eff142598937b3ec2df40942955e8f3 diff --git a/solr/licenses/jetty-compression-common-12.1.10.jar.sha1 b/solr/licenses/jetty-compression-common-12.1.10.jar.sha1 new file mode 100644 index 000000000000..d1cb1a5d311b --- /dev/null +++ b/solr/licenses/jetty-compression-common-12.1.10.jar.sha1 @@ -0,0 +1 @@ +56edb0cb640205312c9939cd485045a09c29ac9f diff --git a/solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1 b/solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1 new file mode 100644 index 000000000000..81012b8a9fef --- /dev/null +++ b/solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1 @@ -0,0 +1 @@ +562e02563cf59cae692ae02d3db93c81205d2030 diff --git a/solr/licenses/jetty-deploy-12.0.34.jar.sha1 b/solr/licenses/jetty-deploy-12.0.34.jar.sha1 deleted file mode 100644 index cc3724737d73..000000000000 --- a/solr/licenses/jetty-deploy-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -26165f854f34e463e6ea0aac0c8197ba12ffb512 diff --git a/solr/licenses/jetty-deploy-12.1.10.jar.sha1 b/solr/licenses/jetty-deploy-12.1.10.jar.sha1 new file mode 100644 index 000000000000..d94d72d84465 --- /dev/null +++ b/solr/licenses/jetty-deploy-12.1.10.jar.sha1 @@ -0,0 +1 @@ +8dd679513cb5de7285fb28430df2dba90d3f51d3 diff --git a/solr/licenses/jetty-ee-12.0.34.jar.sha1 b/solr/licenses/jetty-ee-12.0.34.jar.sha1 deleted file mode 100644 index 9e6432269c8a..000000000000 --- a/solr/licenses/jetty-ee-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -93f882904e48c7e62a9be4a4ee1afa161fddaa49 diff --git a/solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1 b/solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1 new file mode 100644 index 000000000000..fd678d9b3540 --- /dev/null +++ b/solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1 @@ -0,0 +1 @@ +1bf98faf196ca0e81723f3a11668fef1b6f1b146 diff --git a/solr/licenses/jetty-ee10-servlet-12.0.34.jar.sha1 b/solr/licenses/jetty-ee10-servlet-12.0.34.jar.sha1 deleted file mode 100644 index 84c9f192eb39..000000000000 --- a/solr/licenses/jetty-ee10-servlet-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -84b4654fbf0515069cd045ec0063976c539387b0 diff --git a/solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1 b/solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1 new file mode 100644 index 000000000000..4c1898f49073 --- /dev/null +++ b/solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1 @@ -0,0 +1 @@ +b529bdd980d7aa018ddcaaa8d7d1d4bc96b05950 diff --git a/solr/licenses/jetty-ee10-servlets-12.0.34.jar.sha1 b/solr/licenses/jetty-ee10-servlets-12.0.34.jar.sha1 deleted file mode 100644 index 5d98f4d44a7c..000000000000 --- a/solr/licenses/jetty-ee10-servlets-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e444a39bfa053206649eae3126e6885616a226a8 diff --git a/solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1 b/solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1 new file mode 100644 index 000000000000..11b219398905 --- /dev/null +++ b/solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1 @@ -0,0 +1 @@ +6d8c356ef7f3ddb8d7dcf11349d83347e482bd1c diff --git a/solr/licenses/jetty-ee10-webapp-12.0.34.jar.sha1 b/solr/licenses/jetty-ee10-webapp-12.0.34.jar.sha1 deleted file mode 100644 index e067d665e6e4..000000000000 --- a/solr/licenses/jetty-ee10-webapp-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4c1c7431bf5907f95e90dee2afdb5a5a54b1787d diff --git a/solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1 b/solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1 new file mode 100644 index 000000000000..12fff13994dd --- /dev/null +++ b/solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1 @@ -0,0 +1 @@ +5184fc99a48871ff85b1bf570f22686cdbc5268f diff --git a/solr/licenses/jetty-http-12.0.34.jar.sha1 b/solr/licenses/jetty-http-12.0.34.jar.sha1 deleted file mode 100644 index b46d7bf62d8c..000000000000 --- a/solr/licenses/jetty-http-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5bbaa7aa5307c94b1502a5e379894a4b290a366c diff --git a/solr/licenses/jetty-http-12.1.10.jar.sha1 b/solr/licenses/jetty-http-12.1.10.jar.sha1 new file mode 100644 index 000000000000..af2aa2e2a6b3 --- /dev/null +++ b/solr/licenses/jetty-http-12.1.10.jar.sha1 @@ -0,0 +1 @@ +3dc2e7c72c0140a9ccdc07b74a3faf47aac87fdf diff --git a/solr/licenses/jetty-http2-client-12.0.34.jar.sha1 b/solr/licenses/jetty-http2-client-12.0.34.jar.sha1 deleted file mode 100644 index 40a8c545ca6a..000000000000 --- a/solr/licenses/jetty-http2-client-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4842d2402fd2f146bbd0bb60fb8fc4f1927de590 diff --git a/solr/licenses/jetty-http2-client-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-client-12.1.10.jar.sha1 new file mode 100644 index 000000000000..a541f578aa72 --- /dev/null +++ b/solr/licenses/jetty-http2-client-12.1.10.jar.sha1 @@ -0,0 +1 @@ +7e346e31c3dd0d71c26215b7c9b5b69b80e08d6a diff --git a/solr/licenses/jetty-http2-client-transport-12.0.34.jar.sha1 b/solr/licenses/jetty-http2-client-transport-12.0.34.jar.sha1 deleted file mode 100644 index 2f19bd1cc593..000000000000 --- a/solr/licenses/jetty-http2-client-transport-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -073b31214bef7e7d3d3929c138efc5d89e396092 diff --git a/solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1 new file mode 100644 index 000000000000..916317244dee --- /dev/null +++ b/solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1 @@ -0,0 +1 @@ +ffa333d853c26cab16e61c6269d949e49e5c9d48 diff --git a/solr/licenses/jetty-http2-common-12.0.34.jar.sha1 b/solr/licenses/jetty-http2-common-12.0.34.jar.sha1 deleted file mode 100644 index c5c7e869b708..000000000000 --- a/solr/licenses/jetty-http2-common-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3021867a0eba807c920b770542e34a34d8339297 diff --git a/solr/licenses/jetty-http2-common-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-common-12.1.10.jar.sha1 new file mode 100644 index 000000000000..88183d5cf2d9 --- /dev/null +++ b/solr/licenses/jetty-http2-common-12.1.10.jar.sha1 @@ -0,0 +1 @@ +7608c782bd3f54c4024c17b4bdf68873fc1bb700 diff --git a/solr/licenses/jetty-http2-hpack-12.0.34.jar.sha1 b/solr/licenses/jetty-http2-hpack-12.0.34.jar.sha1 deleted file mode 100644 index 7db78ce11489..000000000000 --- a/solr/licenses/jetty-http2-hpack-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ff8f895c084a5c44ce6f34163043d97ffc7d2896 diff --git a/solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1 new file mode 100644 index 000000000000..76d57ed708f9 --- /dev/null +++ b/solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1 @@ -0,0 +1 @@ +cc7b1671436ddbe77264162cefb5ab9f51efc037 diff --git a/solr/licenses/jetty-http2-server-12.0.34.jar.sha1 b/solr/licenses/jetty-http2-server-12.0.34.jar.sha1 deleted file mode 100644 index f1e2e2f3eec3..000000000000 --- a/solr/licenses/jetty-http2-server-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -433734fd8fa63b58ec4e46682e3cba65cf940ecd diff --git a/solr/licenses/jetty-http2-server-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-server-12.1.10.jar.sha1 new file mode 100644 index 000000000000..09cba07c284b --- /dev/null +++ b/solr/licenses/jetty-http2-server-12.1.10.jar.sha1 @@ -0,0 +1 @@ +04f638c70235a30b791212ad6d8e3ec0b2976938 diff --git a/solr/licenses/jetty-io-12.0.34.jar.sha1 b/solr/licenses/jetty-io-12.0.34.jar.sha1 deleted file mode 100644 index 566d5f32e319..000000000000 --- a/solr/licenses/jetty-io-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8b5a9c8a0c7ecfee8006e96dc8c8a5d49532f35f diff --git a/solr/licenses/jetty-io-12.1.10.jar.sha1 b/solr/licenses/jetty-io-12.1.10.jar.sha1 new file mode 100644 index 000000000000..38b6cc74d775 --- /dev/null +++ b/solr/licenses/jetty-io-12.1.10.jar.sha1 @@ -0,0 +1 @@ +15d137860b0ff721a9fc31a27d4ae283a8acf96c diff --git a/solr/licenses/jetty-jmx-12.0.34.jar.sha1 b/solr/licenses/jetty-jmx-12.0.34.jar.sha1 deleted file mode 100644 index 8acce8577c64..000000000000 --- a/solr/licenses/jetty-jmx-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -883af008c04cadc199d82cc26cd671dbb0174765 diff --git a/solr/licenses/jetty-jmx-12.1.10.jar.sha1 b/solr/licenses/jetty-jmx-12.1.10.jar.sha1 new file mode 100644 index 000000000000..3abd006c814d --- /dev/null +++ b/solr/licenses/jetty-jmx-12.1.10.jar.sha1 @@ -0,0 +1 @@ +7a9d1b46f18c8864993dfc9c575b660f909e7ec0 diff --git a/solr/licenses/jetty-rewrite-12.0.34.jar.sha1 b/solr/licenses/jetty-rewrite-12.0.34.jar.sha1 deleted file mode 100644 index c6ea629d63d5..000000000000 --- a/solr/licenses/jetty-rewrite-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8259d9eef9814ded6570b61f3fbebed629a9c517 diff --git a/solr/licenses/jetty-rewrite-12.1.10.jar.sha1 b/solr/licenses/jetty-rewrite-12.1.10.jar.sha1 new file mode 100644 index 000000000000..0c257f8329e0 --- /dev/null +++ b/solr/licenses/jetty-rewrite-12.1.10.jar.sha1 @@ -0,0 +1 @@ +a75b776fa76e810c04778b3fdfb6bba62dad46a1 diff --git a/solr/licenses/jetty-security-12.0.34.jar.sha1 b/solr/licenses/jetty-security-12.0.34.jar.sha1 deleted file mode 100644 index 43ce936755f9..000000000000 --- a/solr/licenses/jetty-security-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -45d9e832527e91da7c3ce7c822858297b1cbaa9a diff --git a/solr/licenses/jetty-security-12.1.10.jar.sha1 b/solr/licenses/jetty-security-12.1.10.jar.sha1 new file mode 100644 index 000000000000..e0f2cea600fd --- /dev/null +++ b/solr/licenses/jetty-security-12.1.10.jar.sha1 @@ -0,0 +1 @@ +5abccd4b0958c9a77c9f9eb5a0266f31f99bb34f diff --git a/solr/licenses/jetty-server-12.0.34.jar.sha1 b/solr/licenses/jetty-server-12.0.34.jar.sha1 deleted file mode 100644 index 7ac786113033..000000000000 --- a/solr/licenses/jetty-server-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3d8629e472af7c6962d417231c41c291c2e0ed11 diff --git a/solr/licenses/jetty-server-12.1.10.jar.sha1 b/solr/licenses/jetty-server-12.1.10.jar.sha1 new file mode 100644 index 000000000000..3a0ed5379783 --- /dev/null +++ b/solr/licenses/jetty-server-12.1.10.jar.sha1 @@ -0,0 +1 @@ +bbe5bc298a649d66cfe966525dce04af71f663ec diff --git a/solr/licenses/jetty-session-12.0.34.jar.sha1 b/solr/licenses/jetty-session-12.0.34.jar.sha1 deleted file mode 100644 index f9006b33cc07..000000000000 --- a/solr/licenses/jetty-session-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2083b4e2c16f8a25239fea335b3cae7cd4f34800 diff --git a/solr/licenses/jetty-session-12.1.10.jar.sha1 b/solr/licenses/jetty-session-12.1.10.jar.sha1 new file mode 100644 index 000000000000..a1bfe0867589 --- /dev/null +++ b/solr/licenses/jetty-session-12.1.10.jar.sha1 @@ -0,0 +1 @@ +2b4df453d0bdb44a2c629ef7e07763f054727944 diff --git a/solr/licenses/jetty-start-12.0.34-shaded.jar.sha1 b/solr/licenses/jetty-start-12.0.34-shaded.jar.sha1 deleted file mode 100644 index 40846f65e35f..000000000000 --- a/solr/licenses/jetty-start-12.0.34-shaded.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -83a127017d50a6e93197a93da2e48761b89f690d diff --git a/solr/licenses/jetty-start-12.1.10-shaded.jar.sha1 b/solr/licenses/jetty-start-12.1.10-shaded.jar.sha1 new file mode 100644 index 000000000000..52b8215cd53c --- /dev/null +++ b/solr/licenses/jetty-start-12.1.10-shaded.jar.sha1 @@ -0,0 +1 @@ +d2d1aed98485163fbe79d5e497a5e54f6701fdf3 diff --git a/solr/licenses/jetty-util-12.0.34.jar.sha1 b/solr/licenses/jetty-util-12.0.34.jar.sha1 deleted file mode 100644 index eee40ed7a7ed..000000000000 --- a/solr/licenses/jetty-util-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b4db54e200023c7bc945150c00fd1ee7ddd82650 diff --git a/solr/licenses/jetty-util-12.1.10.jar.sha1 b/solr/licenses/jetty-util-12.1.10.jar.sha1 new file mode 100644 index 000000000000..cb1ecaaf368b --- /dev/null +++ b/solr/licenses/jetty-util-12.1.10.jar.sha1 @@ -0,0 +1 @@ +dea1bd8e110853f3a0a15e8a8096faa2cf61e278 diff --git a/solr/licenses/jetty-xml-12.0.34.jar.sha1 b/solr/licenses/jetty-xml-12.0.34.jar.sha1 deleted file mode 100644 index 309f078511bd..000000000000 --- a/solr/licenses/jetty-xml-12.0.34.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5311e749ddc1cd13c194fa1bf68d5b51b2d04ea2 diff --git a/solr/licenses/jetty-xml-12.1.10.jar.sha1 b/solr/licenses/jetty-xml-12.1.10.jar.sha1 new file mode 100644 index 000000000000..06242e6a8322 --- /dev/null +++ b/solr/licenses/jetty-xml-12.1.10.jar.sha1 @@ -0,0 +1 @@ +e57126ad4023d4c86b24dffb0dacc9fce622828c diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index 53254af3e703..11c2394fed83 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -131,24 +131,26 @@ org.carrot2:morfologik-fsa:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,test org.carrot2:morfologik-polish:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.carrot2:morfologik-stemming:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index a8753f9aa544..439ac593c6be 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -119,24 +119,26 @@ org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClass org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.carrot2:carrot2-core:4.8.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index c4209b36adf9..77ead19c002a 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -123,24 +123,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile index cf4fd9ea8f15..3bed222adee3 100644 --- a/solr/modules/cuvs/gradle.lockfile +++ b/solr/modules/cuvs/gradle.lockfile @@ -120,24 +120,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 8fc926cd078e..ca081c89476f 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -123,24 +123,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index 84a248c04df8..23ad4931c67f 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -177,24 +177,26 @@ org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:4.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.6.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index 5ae1d486b4d6..f0acb5fa8ce7 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -145,24 +145,26 @@ org.bouncycastle:bcpkix-jdk18on:1.85=jarValidation,testCompileClasspath,testRunt org.bouncycastle:bcprov-jdk18on:1.85=jarValidation,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcutil-jdk18on:1.85=jarValidation,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.freemarker:freemarker:2.3.34=jarValidation,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index 47bbe25c32e3..64c00e886533 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -120,24 +120,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile index e963d3b4832c..90d6e053d2f7 100644 --- a/solr/modules/language-models/gradle.lockfile +++ b/solr/modules/language-models/gradle.lockfile @@ -131,24 +131,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index c21e7be0afaf..3655d198d3cc 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -119,24 +119,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index 498b6d0b0d62..4b313826d12b 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -128,24 +128,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 9b15c3ab848e..99391082e644 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -129,24 +129,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index d7c0c2103017..6305398f71ca 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -118,24 +118,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 9081a4c69673..4836266e17d2 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -142,24 +142,26 @@ org.checkerframework:checker-qual:4.2.2=compileClasspath,jarValidation,runtimeCl org.codehaus.janino:commons-compiler:3.1.12=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.codehaus.janino:janino:3.1.12=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/packaging/test/test_start_solr.bats b/solr/packaging/test/test_start_solr.bats index be365e7a65b5..806e24c18300 100644 --- a/solr/packaging/test/test_start_solr.bats +++ b/solr/packaging/test/test_start_solr.bats @@ -96,6 +96,20 @@ teardown() { solr assert --started http://localhost:${SOLR_PORT} --timeout 5000 } +@test "webapp is deployed at the /solr context" { + # Jetty 12.1 removed the directory-scanning deployer; the Solr webapp is now added + # directly to the context collection in server/etc/jetty.xml. Verify it deploys at + # /solr and that the context is bound to that path only (an unmapped path 404s). + solr start + solr assert --started http://localhost:${SOLR_PORT} --timeout 5000 + + run curl -s -o /dev/null -w "%{http_code}" "http://localhost:${SOLR_PORT}/solr/admin/info/system" + assert_output "200" + + run curl -s -o /dev/null -w "%{http_code}" "http://localhost:${SOLR_PORT}/not-solr/admin/info/system" + assert_output "404" +} + @test "-c flag prints no-op warning and still starts in cloud mode" { run solr start -c assert_output --partial 'WARNING: -c/--cloud is a no-op. Solr starts in cloud mode by default.' diff --git a/solr/server/contexts/solr-jetty-context.xml b/solr/server/contexts/solr-jetty-context.xml deleted file mode 100644 index a91347d85687..000000000000 --- a/solr/server/contexts/solr-jetty-context.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - /solr - /solr-webapp/webapp - /etc/webdefault.xml - false - - - true - - - - - - -org.eclipse.jetty. - - - - - - diff --git a/solr/server/etc/jetty.xml b/solr/server/etc/jetty.xml index 2f20e329c93c..c6d637b32e8f 100644 --- a/solr/server/etc/jetty.xml +++ b/solr/server/etc/jetty.xml @@ -62,11 +62,11 @@ + - true - + + + + + + + + + + + + /solr + /solr-webapp/webapp + /etc/webdefault.xml + false - - - + + true + + + + + + -org.eclipse.jetty. + + + + + + + + + diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index 139437733aa0..714a732d8103 100644 --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@ -113,31 +113,33 @@ org.apache.lucene:lucene-suggest:10.4.0=jarValidation,runtimeClasspath,solrCore org.apache.zookeeper:zookeeper-jute:3.9.6=jarValidation,runtimeClasspath,solrCore org.apache.zookeeper:zookeeper:3.9.6=jarValidation,runtimeClasspath,solrCore org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty:jetty-deploy:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-ee:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty:jetty-jmx:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-start:12.0.34=jarValidation,startJar -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty:jetty-xml:12.0.34=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,solrCore +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,solrCore +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,solrCore +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,solrCore +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,solrCore +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,solrCore +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,solrCore +org.eclipse.jetty:jetty-deploy:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore +org.eclipse.jetty:jetty-jmx:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,runtimeClasspath,serverLib +org.eclipse.jetty:jetty-start:12.1.10=jarValidation,startJar +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore +org.eclipse.jetty:jetty-xml:12.1.10=jarValidation,runtimeClasspath,serverLib org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,solrCore org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,solrCore org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,solrCore diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index fff21b820676..ea94c06f21b2 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -128,24 +128,26 @@ org.checkerframework:checker-qual:4.2.2=testRuntimeClasspath org.codehaus.janino:commons-compiler:3.1.12=testRuntimeClasspath org.codehaus.janino:janino:3.1.12=testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=cliClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=cliClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=cliClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=cliClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=cliClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=cliClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=cliClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=cliClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=cliClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=cliClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=cliClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=cliClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=cliClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=cliClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=cliClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=cliClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=cliClasspath,testRuntimeClasspath diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc index 065e878a34af..e9b17ebb0e51 100644 --- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc +++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc @@ -129,6 +129,14 @@ Its builder will dynamically detect if solr-jetty is available and use that, oth CommonParams.QT has been un-deprecated. Nonetheless, if your code makes explicit reference to "qt" when constructing a standard request, there is usually a better way. +=== Embedded Jetty Configuration + +Solr 10.1 upgrades the embedded server to Eclipse Jetty 12.1, which removed Jetty's directory-scanning deployer (the `DeploymentManager` and `ContextProvider` classes). +Because Solr serves a single, statically-known webapp, that webapp is now deployed directly in `server/etc/jetty.xml`, and the `server/contexts/solr-jetty-context.xml` file has been removed. + +Advanced users who relied on Jetty scanning the `server/contexts/` directory to auto-deploy additional context descriptors will find that this no longer happens. +To deploy an extra context, or to customize how the Solr webapp itself is deployed, edit `server/etc/jetty.xml` directly and add the context there. + === Testing Framework Standard `solr.xml` configuration used by `MiniSolrCloudCluster` turns off metrics by default (`metricsEnabled=false`) unlike the previous versions of Solr where metrics were enabled by default. Tests that need to access metrics should enable them by setting `System.setProperty("metricsEnabled", "true")` in test suite initialization. diff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfile index 0304ec59bbc0..ec6a6e6f03e4 100644 --- a/solr/solrj-jetty/gradle.lockfile +++ b/solr/solrj-jetty/gradle.lockfile @@ -115,24 +115,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=jarValidation,testCompileClasspath,tes org.apache.zookeeper:zookeeper:3.9.6=jarValidation,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java b/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java index af9248be307b..5a8ef9230b7e 100644 --- a/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java +++ b/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java @@ -45,11 +45,13 @@ public class HttpJettySolrClientCompatibilityTest extends SolrTestCaseJ4 { public void testSystemPropertyFlag() { System.setProperty("solr.http1", "true"); try (var client = new HttpJettySolrClient.Builder().build()) { - assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP); + assertTrue( + client.getHttpClient().getHttpClientTransport() instanceof HttpClientTransportOverHTTP); } System.clearProperty("solr.http1"); try (var client = new HttpJettySolrClient.Builder().build()) { - assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP2); + assertTrue( + client.getHttpClient().getHttpClientTransport() instanceof HttpClientTransportOverHTTP2); } } @@ -70,7 +72,8 @@ public void testConnectToOldNodesUsingHttp1() throws Exception { new HttpJettySolrClient.Builder(solrTestRule.getBaseUrl() + "/debug/foo") .useHttp1_1(true) .build()) { - assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP); + assertTrue( + client.getHttpClient().getHttpClientTransport() instanceof HttpClientTransportOverHTTP); try { client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET); } catch (RemoteSolrException ignored) { @@ -94,7 +97,8 @@ public void testConnectToNewNodesUsingHttp1() throws Exception { new HttpJettySolrClient.Builder(solrTestRule.getBaseUrl() + "/debug/foo") .useHttp1_1(true) .build()) { - assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP); + assertTrue( + client.getHttpClient().getHttpClientTransport() instanceof HttpClientTransportOverHTTP); try { client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET); } catch (RemoteSolrException ignored) { @@ -122,7 +126,8 @@ public void testConnectToOldNodesUsingHttp2() throws Exception { System.clearProperty("solr.http1"); try (var client = new HttpJettySolrClient.Builder(solrTestRule.getBaseUrl() + "/debug/foo").build()) { - assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP2); + assertTrue( + client.getHttpClient().getHttpClientTransport() instanceof HttpClientTransportOverHTTP2); try { client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET); fail("Jetty client with HTTP2 transport should not be able to connect to HTTP1 only nodes"); diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index 004a705da32a..40a0124c7208 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -126,24 +126,26 @@ org.checkerframework:checker-qual:4.2.2=jarValidation,testRuntimeClasspath org.codehaus.janino:commons-compiler:3.1.12=jarValidation,testRuntimeClasspath org.codehaus.janino:janino:3.1.12=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index 2a45aa238323..7c4747b45695 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -115,24 +115,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 083e3e3f8567..7420bc27d665 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -116,27 +116,29 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=jarValidation,testCompileClasspath,tes org.apache.zookeeper:zookeeper:3.9.6=jarValidation,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-ee:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-xml:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-xml:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 58014807e164..9a7b62d5cc1e 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -116,24 +116,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index b384fe728aee..b40fad3f5820 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -131,30 +131,32 @@ org.checkerframework:checker-qual:4.2.2=jarValidation,testRuntimeClasspath org.codehaus.janino:commons-compiler:3.1.12=jarValidation,testRuntimeClasspath org.codehaus.janino:janino:3.1.12=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,solrCore,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,serverLib,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.34=serverLib -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.34=serverLib -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,solrCore,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,serverLib,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,solrCore,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,serverLib,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,serverLib,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,solrCore,testRuntimeClasspath -org.eclipse.jetty:jetty-deploy:12.0.34=serverLib -org.eclipse.jetty:jetty-ee:12.0.34=serverLib -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-jmx:12.0.34=serverLib -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,serverLib,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,serverLib,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-xml:12.0.34=serverLib +org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,solrCore,testRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,solrCore,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,serverLib,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.10=serverLib +org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=serverLib +org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=serverLib +org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,solrCore,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,serverLib,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,solrCore,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,serverLib,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,serverLib,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.10=jarValidation,solrCore,testRuntimeClasspath +org.eclipse.jetty:jetty-deploy:12.1.10=serverLib +org.eclipse.jetty:jetty-http:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-jmx:12.1.10=serverLib +org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,serverLib,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.10=jarValidation,serverLib,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-xml:12.1.10=serverLib org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,solrCore,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,solrCore,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,solrCore,testRuntimeClasspath From 2eb701c61722f3a261103ca2d184a331356079f8 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Wed, 29 Jul 2026 11:41:49 -0400 Subject: [PATCH 2/4] SOLR-18297: documentation: don't say "embedded" Jetty (#4664) Not wrong but confusing IMO (cherry picked from commit b4d85edf64c765e6a623265c11f90a624bc54084) --- .../modules/upgrade-notes/pages/major-changes-in-solr-10.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc index e9b17ebb0e51..d8450340a57b 100644 --- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc +++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc @@ -129,9 +129,9 @@ Its builder will dynamically detect if solr-jetty is available and use that, oth CommonParams.QT has been un-deprecated. Nonetheless, if your code makes explicit reference to "qt" when constructing a standard request, there is usually a better way. -=== Embedded Jetty Configuration +=== Jetty Configuration -Solr 10.1 upgrades the embedded server to Eclipse Jetty 12.1, which removed Jetty's directory-scanning deployer (the `DeploymentManager` and `ContextProvider` classes). +Solr 10.1 upgrades the server to Eclipse Jetty 12.1, which removed Jetty's directory-scanning deployer (the `DeploymentManager` and `ContextProvider` classes). Because Solr serves a single, statically-known webapp, that webapp is now deployed directly in `server/etc/jetty.xml`, and the `server/contexts/solr-jetty-context.xml` file has been removed. Advanced users who relied on Jetty scanning the `server/contexts/` directory to auto-deploy additional context descriptors will find that this no longer happens. From 4507807d282f2e8560869a9c48176a63968f22a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Sat, 10 Oct 2026 23:12:41 +0200 Subject: [PATCH 3/4] SOLR-18297: Upgrade Jetty to 12.1.14 (#5059) (cherry picked from commit eaf9c86369daebd82d1abe92e5af7b7200e40d2e) --- ...0.yml => SOLR-18297-update-jetty-12.1.yml} | 2 +- gradle/libs.versions.toml | 2 +- solr/api/gradle.lockfile | 40 +++++++------- solr/benchmark/gradle.lockfile | 40 +++++++------- solr/core/gradle.lockfile | 40 +++++++------- .../solr/cloud/TestGracefulJettyShutdown.java | 19 ++++--- solr/cross-dc-manager/gradle.lockfile | 52 +++++++++--------- .../jetty-alpn-client-12.1.10.jar.sha1 | 1 - .../jetty-alpn-client-12.1.14.jar.sha1 | 1 + .../jetty-alpn-java-client-12.1.10.jar.sha1 | 1 - .../jetty-alpn-java-client-12.1.14.jar.sha1 | 1 + .../jetty-alpn-java-server-12.1.10.jar.sha1 | 1 - .../jetty-alpn-java-server-12.1.14.jar.sha1 | 1 + .../jetty-alpn-server-12.1.10.jar.sha1 | 1 - .../jetty-alpn-server-12.1.14.jar.sha1 | 1 + solr/licenses/jetty-client-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-client-12.1.14.jar.sha1 | 1 + .../jetty-compression-common-12.1.10.jar.sha1 | 1 - .../jetty-compression-common-12.1.14.jar.sha1 | 1 + .../jetty-compression-gzip-12.1.10.jar.sha1 | 1 - .../jetty-compression-gzip-12.1.14.jar.sha1 | 1 + solr/licenses/jetty-deploy-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-deploy-12.1.14.jar.sha1 | 1 + .../licenses/jetty-ee-webapp-12.1.10.jar.sha1 | 1 - .../licenses/jetty-ee-webapp-12.1.14.jar.sha1 | 1 + .../jetty-ee10-servlet-12.1.10.jar.sha1 | 1 - .../jetty-ee10-servlet-12.1.14.jar.sha1 | 1 + .../jetty-ee10-servlets-12.1.10.jar.sha1 | 1 - .../jetty-ee10-servlets-12.1.14.jar.sha1 | 1 + .../jetty-ee10-webapp-12.1.10.jar.sha1 | 1 - .../jetty-ee10-webapp-12.1.14.jar.sha1 | 1 + solr/licenses/jetty-http-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-http-12.1.14.jar.sha1 | 1 + .../jetty-http2-client-12.1.10.jar.sha1 | 1 - .../jetty-http2-client-12.1.14.jar.sha1 | 1 + ...ty-http2-client-transport-12.1.10.jar.sha1 | 1 - ...ty-http2-client-transport-12.1.14.jar.sha1 | 1 + .../jetty-http2-common-12.1.10.jar.sha1 | 1 - .../jetty-http2-common-12.1.14.jar.sha1 | 1 + .../jetty-http2-hpack-12.1.10.jar.sha1 | 1 - .../jetty-http2-hpack-12.1.14.jar.sha1 | 1 + .../jetty-http2-server-12.1.10.jar.sha1 | 1 - .../jetty-http2-server-12.1.14.jar.sha1 | 1 + solr/licenses/jetty-io-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-io-12.1.14.jar.sha1 | 1 + solr/licenses/jetty-jmx-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-jmx-12.1.14.jar.sha1 | 1 + solr/licenses/jetty-rewrite-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-rewrite-12.1.14.jar.sha1 | 1 + solr/licenses/jetty-security-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-security-12.1.14.jar.sha1 | 1 + solr/licenses/jetty-server-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-server-12.1.14.jar.sha1 | 1 + solr/licenses/jetty-session-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-session-12.1.14.jar.sha1 | 1 + .../jetty-start-12.1.10-shaded.jar.sha1 | 1 - .../jetty-start-12.1.14-shaded.jar.sha1 | 1 + solr/licenses/jetty-util-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-util-12.1.14.jar.sha1 | 1 + solr/licenses/jetty-xml-12.1.10.jar.sha1 | 1 - solr/licenses/jetty-xml-12.1.14.jar.sha1 | 1 + solr/modules/analysis-extras/gradle.lockfile | 40 +++++++------- solr/modules/clustering/gradle.lockfile | 40 +++++++------- solr/modules/cross-dc/gradle.lockfile | 40 +++++++------- solr/modules/cuvs/gradle.lockfile | 40 +++++++------- solr/modules/extraction/gradle.lockfile | 40 +++++++------- solr/modules/gcs-repository/gradle.lockfile | 40 +++++++------- solr/modules/jwt-auth/gradle.lockfile | 40 +++++++------- solr/modules/langid/gradle.lockfile | 40 +++++++------- solr/modules/language-models/gradle.lockfile | 40 +++++++------- solr/modules/ltr/gradle.lockfile | 40 +++++++------- solr/modules/opentelemetry/gradle.lockfile | 40 +++++++------- solr/modules/s3-repository/gradle.lockfile | 40 +++++++------- solr/modules/scripting/gradle.lockfile | 40 +++++++------- solr/modules/sql/gradle.lockfile | 40 +++++++------- solr/server/gradle.lockfile | 54 +++++++++---------- solr/solr-ref-guide/gradle.lockfile | 40 +++++++------- solr/solrj-jetty/gradle.lockfile | 40 +++++++------- solr/solrj-streaming/gradle.lockfile | 40 +++++++------- solr/solrj-zookeeper/gradle.lockfile | 40 +++++++------- solr/solrj/gradle.lockfile | 46 ++++++++-------- solr/test-framework/gradle.lockfile | 40 +++++++------- solr/webapp/gradle.lockfile | 52 +++++++++--------- 83 files changed, 583 insertions(+), 578 deletions(-) rename changelog/unreleased/{SOLR-18297-update-jetty-12.1.10.yml => SOLR-18297-update-jetty-12.1.yml} (78%) delete mode 100644 solr/licenses/jetty-alpn-client-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-client-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-java-client-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-java-server-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-server-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-server-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-client-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-client-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-compression-common-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-compression-common-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-compression-gzip-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-deploy-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-deploy-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee-webapp-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-servlet-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-servlets-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-webapp-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-http-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-http-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-http2-client-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-http2-client-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-http2-client-transport-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-http2-common-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-http2-common-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-http2-hpack-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-http2-server-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-http2-server-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-io-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-io-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-jmx-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-jmx-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-rewrite-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-rewrite-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-security-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-security-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-server-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-server-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-session-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-session-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-start-12.1.10-shaded.jar.sha1 create mode 100644 solr/licenses/jetty-start-12.1.14-shaded.jar.sha1 delete mode 100644 solr/licenses/jetty-util-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-util-12.1.14.jar.sha1 delete mode 100644 solr/licenses/jetty-xml-12.1.10.jar.sha1 create mode 100644 solr/licenses/jetty-xml-12.1.14.jar.sha1 diff --git a/changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml b/changelog/unreleased/SOLR-18297-update-jetty-12.1.yml similarity index 78% rename from changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml rename to changelog/unreleased/SOLR-18297-update-jetty-12.1.yml index 4d9a12221760..7029d619b339 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.14 type: dependency_update authors: - name: Jan Høydahl diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d3dda1c5d395..4e79425af829 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.10" +eclipse-jetty = "12.1.14" # @keep jgit version used by git-status.gradle eclipse-jgit = "7.7.1.202607240634-r" fasterxml = "2.22.3" diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index bb6ffce2fae5..b6ae8ff5d7d5 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,tes org.apache.zookeeper:zookeeper:3.9.6=jarValidation,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index cc04c779e0a1..fbd5d6b60cfd 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,runtimeClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index aa8a49874d4e..1e4de87a2cd7 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -133,26 +133,26 @@ org.carrot2:morfologik-fsa:2.1.9=jarValidation,testRuntimeClasspath org.carrot2:morfologik-polish:2.1.9=jarValidation,testRuntimeClasspath org.carrot2:morfologik-stemming:2.1.9=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --git a/solr/core/src/test/org/apache/solr/cloud/TestGracefulJettyShutdown.java b/solr/core/src/test/org/apache/solr/cloud/TestGracefulJettyShutdown.java index a0c6fdbec99d..04a4f98bec39 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.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.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; @@ -44,11 +47,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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); @@ -78,16 +82,17 @@ public void testSingleShardInFlightRequestsDuringShutDown() throws Exception { 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> 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.lockfile index 26aa3131b478..0b07b658b22f 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.10=solrPlatformLibs -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=solrPlatformLibs -org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=solrPlatformLibs -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-deploy:12.1.10=solrPlatformLibs -org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-jmx:12.1.10=solrPlatformLibs -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-xml:12.1.10=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=solrPlatformLibs org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/licenses/jetty-alpn-client-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-client-12.1.10.jar.sha1 deleted file mode 100644 index f8082f4312fd..000000000000 --- a/solr/licenses/jetty-alpn-client-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -94ab4407094de3ce38133d13ab59780498d3c90c diff --git a/solr/licenses/jetty-alpn-client-12.1.14.jar.sha1 b/solr/licenses/jetty-alpn-client-12.1.14.jar.sha1 new file mode 100644 index 000000000000..8a70b27ed5ef --- /dev/null +++ b/solr/licenses/jetty-alpn-client-12.1.14.jar.sha1 @@ -0,0 +1 @@ +5143e09ca956aed07d0cff37238c046fee5cbc01 diff --git a/solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1 deleted file mode 100644 index 3149bd049587..000000000000 --- a/solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2af3d913959286bfb414162fe7aa0ef0faa72d38 diff --git a/solr/licenses/jetty-alpn-java-client-12.1.14.jar.sha1 b/solr/licenses/jetty-alpn-java-client-12.1.14.jar.sha1 new file mode 100644 index 000000000000..74d755f86f16 --- /dev/null +++ b/solr/licenses/jetty-alpn-java-client-12.1.14.jar.sha1 @@ -0,0 +1 @@ +da3c1f869bc23d1dba446c844e21b132e999750f diff --git a/solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1 deleted file mode 100644 index 54f26378b8d7..000000000000 --- a/solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4724aedc068a3ac0f465d343d5afea10455a70b1 diff --git a/solr/licenses/jetty-alpn-java-server-12.1.14.jar.sha1 b/solr/licenses/jetty-alpn-java-server-12.1.14.jar.sha1 new file mode 100644 index 000000000000..64380d7b3190 --- /dev/null +++ b/solr/licenses/jetty-alpn-java-server-12.1.14.jar.sha1 @@ -0,0 +1 @@ +c01bb7513658e0f8921de3dd6b0bccb6fc3ef343 diff --git a/solr/licenses/jetty-alpn-server-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-server-12.1.10.jar.sha1 deleted file mode 100644 index f8ec9e359d65..000000000000 --- a/solr/licenses/jetty-alpn-server-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -69e9e69f93b1807ed6a7e06b500d0ba1fa998124 diff --git a/solr/licenses/jetty-alpn-server-12.1.14.jar.sha1 b/solr/licenses/jetty-alpn-server-12.1.14.jar.sha1 new file mode 100644 index 000000000000..ff96719f186f --- /dev/null +++ b/solr/licenses/jetty-alpn-server-12.1.14.jar.sha1 @@ -0,0 +1 @@ +064aaf44c3ec891b2e9463b0f3a0cf150d0c432e diff --git a/solr/licenses/jetty-client-12.1.10.jar.sha1 b/solr/licenses/jetty-client-12.1.10.jar.sha1 deleted file mode 100644 index ddfc6823e9da..000000000000 --- a/solr/licenses/jetty-client-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5388ae528eff142598937b3ec2df40942955e8f3 diff --git a/solr/licenses/jetty-client-12.1.14.jar.sha1 b/solr/licenses/jetty-client-12.1.14.jar.sha1 new file mode 100644 index 000000000000..791e9b8bb554 --- /dev/null +++ b/solr/licenses/jetty-client-12.1.14.jar.sha1 @@ -0,0 +1 @@ +f04937059223f8524ed4f5b860a46f6e34796cdc diff --git a/solr/licenses/jetty-compression-common-12.1.10.jar.sha1 b/solr/licenses/jetty-compression-common-12.1.10.jar.sha1 deleted file mode 100644 index d1cb1a5d311b..000000000000 --- a/solr/licenses/jetty-compression-common-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -56edb0cb640205312c9939cd485045a09c29ac9f diff --git a/solr/licenses/jetty-compression-common-12.1.14.jar.sha1 b/solr/licenses/jetty-compression-common-12.1.14.jar.sha1 new file mode 100644 index 000000000000..99fb75811abb --- /dev/null +++ b/solr/licenses/jetty-compression-common-12.1.14.jar.sha1 @@ -0,0 +1 @@ +19e7d0bc261cc061ac2e4a9ad4303cd37b0a6cc2 diff --git a/solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1 b/solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1 deleted file mode 100644 index 81012b8a9fef..000000000000 --- a/solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -562e02563cf59cae692ae02d3db93c81205d2030 diff --git a/solr/licenses/jetty-compression-gzip-12.1.14.jar.sha1 b/solr/licenses/jetty-compression-gzip-12.1.14.jar.sha1 new file mode 100644 index 000000000000..49f59db98ff3 --- /dev/null +++ b/solr/licenses/jetty-compression-gzip-12.1.14.jar.sha1 @@ -0,0 +1 @@ +ab3b06bbd09f34e98bed3dae3136f7225691b893 diff --git a/solr/licenses/jetty-deploy-12.1.10.jar.sha1 b/solr/licenses/jetty-deploy-12.1.10.jar.sha1 deleted file mode 100644 index d94d72d84465..000000000000 --- a/solr/licenses/jetty-deploy-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8dd679513cb5de7285fb28430df2dba90d3f51d3 diff --git a/solr/licenses/jetty-deploy-12.1.14.jar.sha1 b/solr/licenses/jetty-deploy-12.1.14.jar.sha1 new file mode 100644 index 000000000000..7fe11ee72e71 --- /dev/null +++ b/solr/licenses/jetty-deploy-12.1.14.jar.sha1 @@ -0,0 +1 @@ +a987f5d66113ac11c1c565cc9c030380e7b2ada7 diff --git a/solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1 b/solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1 deleted file mode 100644 index fd678d9b3540..000000000000 --- a/solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1bf98faf196ca0e81723f3a11668fef1b6f1b146 diff --git a/solr/licenses/jetty-ee-webapp-12.1.14.jar.sha1 b/solr/licenses/jetty-ee-webapp-12.1.14.jar.sha1 new file mode 100644 index 000000000000..6bb24e0f73e3 --- /dev/null +++ b/solr/licenses/jetty-ee-webapp-12.1.14.jar.sha1 @@ -0,0 +1 @@ +6e0be2ac1e0243d2314b5d455f29583b444d6aa4 diff --git a/solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1 b/solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1 deleted file mode 100644 index 4c1898f49073..000000000000 --- a/solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b529bdd980d7aa018ddcaaa8d7d1d4bc96b05950 diff --git a/solr/licenses/jetty-ee10-servlet-12.1.14.jar.sha1 b/solr/licenses/jetty-ee10-servlet-12.1.14.jar.sha1 new file mode 100644 index 000000000000..ddc3f298eafc --- /dev/null +++ b/solr/licenses/jetty-ee10-servlet-12.1.14.jar.sha1 @@ -0,0 +1 @@ +62e4f613eb60b91515bc5991478eae85b8c38ab8 diff --git a/solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1 b/solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1 deleted file mode 100644 index 11b219398905..000000000000 --- a/solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6d8c356ef7f3ddb8d7dcf11349d83347e482bd1c diff --git a/solr/licenses/jetty-ee10-servlets-12.1.14.jar.sha1 b/solr/licenses/jetty-ee10-servlets-12.1.14.jar.sha1 new file mode 100644 index 000000000000..b9762a6f1e88 --- /dev/null +++ b/solr/licenses/jetty-ee10-servlets-12.1.14.jar.sha1 @@ -0,0 +1 @@ +6dcd4c6170c6fc70763e889d6e9752e373fd2c5a diff --git a/solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1 b/solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1 deleted file mode 100644 index 12fff13994dd..000000000000 --- a/solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5184fc99a48871ff85b1bf570f22686cdbc5268f diff --git a/solr/licenses/jetty-ee10-webapp-12.1.14.jar.sha1 b/solr/licenses/jetty-ee10-webapp-12.1.14.jar.sha1 new file mode 100644 index 000000000000..b52656c07ade --- /dev/null +++ b/solr/licenses/jetty-ee10-webapp-12.1.14.jar.sha1 @@ -0,0 +1 @@ +e055d8c22e3d5a24ddddd38c50f44b9452a0e550 diff --git a/solr/licenses/jetty-http-12.1.10.jar.sha1 b/solr/licenses/jetty-http-12.1.10.jar.sha1 deleted file mode 100644 index af2aa2e2a6b3..000000000000 --- a/solr/licenses/jetty-http-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3dc2e7c72c0140a9ccdc07b74a3faf47aac87fdf diff --git a/solr/licenses/jetty-http-12.1.14.jar.sha1 b/solr/licenses/jetty-http-12.1.14.jar.sha1 new file mode 100644 index 000000000000..82c43a6f9134 --- /dev/null +++ b/solr/licenses/jetty-http-12.1.14.jar.sha1 @@ -0,0 +1 @@ +511ea5749bc221b4b9c6d70978bd377053ba3c44 diff --git a/solr/licenses/jetty-http2-client-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-client-12.1.10.jar.sha1 deleted file mode 100644 index a541f578aa72..000000000000 --- a/solr/licenses/jetty-http2-client-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7e346e31c3dd0d71c26215b7c9b5b69b80e08d6a diff --git a/solr/licenses/jetty-http2-client-12.1.14.jar.sha1 b/solr/licenses/jetty-http2-client-12.1.14.jar.sha1 new file mode 100644 index 000000000000..4f36e67bb3ad --- /dev/null +++ b/solr/licenses/jetty-http2-client-12.1.14.jar.sha1 @@ -0,0 +1 @@ +a3aa9bb4097d04bffeeaa8ae6c662f6a7cf0a99f diff --git a/solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1 deleted file mode 100644 index 916317244dee..000000000000 --- a/solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ffa333d853c26cab16e61c6269d949e49e5c9d48 diff --git a/solr/licenses/jetty-http2-client-transport-12.1.14.jar.sha1 b/solr/licenses/jetty-http2-client-transport-12.1.14.jar.sha1 new file mode 100644 index 000000000000..5cafb40a6e54 --- /dev/null +++ b/solr/licenses/jetty-http2-client-transport-12.1.14.jar.sha1 @@ -0,0 +1 @@ +1b9c9763ae01e32eaf4aa8d48799c758fa001ae9 diff --git a/solr/licenses/jetty-http2-common-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-common-12.1.10.jar.sha1 deleted file mode 100644 index 88183d5cf2d9..000000000000 --- a/solr/licenses/jetty-http2-common-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7608c782bd3f54c4024c17b4bdf68873fc1bb700 diff --git a/solr/licenses/jetty-http2-common-12.1.14.jar.sha1 b/solr/licenses/jetty-http2-common-12.1.14.jar.sha1 new file mode 100644 index 000000000000..0f10fa4bb170 --- /dev/null +++ b/solr/licenses/jetty-http2-common-12.1.14.jar.sha1 @@ -0,0 +1 @@ +c31e1aa8358bb07d83c4b30a6a742a19a50fbd71 diff --git a/solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1 deleted file mode 100644 index 76d57ed708f9..000000000000 --- a/solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cc7b1671436ddbe77264162cefb5ab9f51efc037 diff --git a/solr/licenses/jetty-http2-hpack-12.1.14.jar.sha1 b/solr/licenses/jetty-http2-hpack-12.1.14.jar.sha1 new file mode 100644 index 000000000000..3a56c14ee556 --- /dev/null +++ b/solr/licenses/jetty-http2-hpack-12.1.14.jar.sha1 @@ -0,0 +1 @@ +4e05d3365520a870b61d3c02a938d48e491353a2 diff --git a/solr/licenses/jetty-http2-server-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-server-12.1.10.jar.sha1 deleted file mode 100644 index 09cba07c284b..000000000000 --- a/solr/licenses/jetty-http2-server-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -04f638c70235a30b791212ad6d8e3ec0b2976938 diff --git a/solr/licenses/jetty-http2-server-12.1.14.jar.sha1 b/solr/licenses/jetty-http2-server-12.1.14.jar.sha1 new file mode 100644 index 000000000000..fbf2e74f4367 --- /dev/null +++ b/solr/licenses/jetty-http2-server-12.1.14.jar.sha1 @@ -0,0 +1 @@ +60b8b869ff20bb1f967cfebb8134f2821afe978c diff --git a/solr/licenses/jetty-io-12.1.10.jar.sha1 b/solr/licenses/jetty-io-12.1.10.jar.sha1 deleted file mode 100644 index 38b6cc74d775..000000000000 --- a/solr/licenses/jetty-io-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -15d137860b0ff721a9fc31a27d4ae283a8acf96c diff --git a/solr/licenses/jetty-io-12.1.14.jar.sha1 b/solr/licenses/jetty-io-12.1.14.jar.sha1 new file mode 100644 index 000000000000..8b403b1b55e0 --- /dev/null +++ b/solr/licenses/jetty-io-12.1.14.jar.sha1 @@ -0,0 +1 @@ +c933762558ba8b795dc11b11c70f208256d22ea7 diff --git a/solr/licenses/jetty-jmx-12.1.10.jar.sha1 b/solr/licenses/jetty-jmx-12.1.10.jar.sha1 deleted file mode 100644 index 3abd006c814d..000000000000 --- a/solr/licenses/jetty-jmx-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7a9d1b46f18c8864993dfc9c575b660f909e7ec0 diff --git a/solr/licenses/jetty-jmx-12.1.14.jar.sha1 b/solr/licenses/jetty-jmx-12.1.14.jar.sha1 new file mode 100644 index 000000000000..4f1a1f762351 --- /dev/null +++ b/solr/licenses/jetty-jmx-12.1.14.jar.sha1 @@ -0,0 +1 @@ +1b945b46ff2d828de25274210cc592810a79bb8d diff --git a/solr/licenses/jetty-rewrite-12.1.10.jar.sha1 b/solr/licenses/jetty-rewrite-12.1.10.jar.sha1 deleted file mode 100644 index 0c257f8329e0..000000000000 --- a/solr/licenses/jetty-rewrite-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a75b776fa76e810c04778b3fdfb6bba62dad46a1 diff --git a/solr/licenses/jetty-rewrite-12.1.14.jar.sha1 b/solr/licenses/jetty-rewrite-12.1.14.jar.sha1 new file mode 100644 index 000000000000..dee3ac64bbdf --- /dev/null +++ b/solr/licenses/jetty-rewrite-12.1.14.jar.sha1 @@ -0,0 +1 @@ +6dee2bc3f4e559974578ffa0d00ebdfa500e1184 diff --git a/solr/licenses/jetty-security-12.1.10.jar.sha1 b/solr/licenses/jetty-security-12.1.10.jar.sha1 deleted file mode 100644 index e0f2cea600fd..000000000000 --- a/solr/licenses/jetty-security-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5abccd4b0958c9a77c9f9eb5a0266f31f99bb34f diff --git a/solr/licenses/jetty-security-12.1.14.jar.sha1 b/solr/licenses/jetty-security-12.1.14.jar.sha1 new file mode 100644 index 000000000000..2dca0b8d8bcb --- /dev/null +++ b/solr/licenses/jetty-security-12.1.14.jar.sha1 @@ -0,0 +1 @@ +3c20ea87010a5b0f92fa825a79fa70753fce8979 diff --git a/solr/licenses/jetty-server-12.1.10.jar.sha1 b/solr/licenses/jetty-server-12.1.10.jar.sha1 deleted file mode 100644 index 3a0ed5379783..000000000000 --- a/solr/licenses/jetty-server-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bbe5bc298a649d66cfe966525dce04af71f663ec diff --git a/solr/licenses/jetty-server-12.1.14.jar.sha1 b/solr/licenses/jetty-server-12.1.14.jar.sha1 new file mode 100644 index 000000000000..bdb9d32bb009 --- /dev/null +++ b/solr/licenses/jetty-server-12.1.14.jar.sha1 @@ -0,0 +1 @@ +d9ee042059cc5252411baa6bd1192bd2840d503d diff --git a/solr/licenses/jetty-session-12.1.10.jar.sha1 b/solr/licenses/jetty-session-12.1.10.jar.sha1 deleted file mode 100644 index a1bfe0867589..000000000000 --- a/solr/licenses/jetty-session-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2b4df453d0bdb44a2c629ef7e07763f054727944 diff --git a/solr/licenses/jetty-session-12.1.14.jar.sha1 b/solr/licenses/jetty-session-12.1.14.jar.sha1 new file mode 100644 index 000000000000..865ce11d9dbd --- /dev/null +++ b/solr/licenses/jetty-session-12.1.14.jar.sha1 @@ -0,0 +1 @@ +387fd27c404b2ba9ebf69688c477a8dbb6604676 diff --git a/solr/licenses/jetty-start-12.1.10-shaded.jar.sha1 b/solr/licenses/jetty-start-12.1.10-shaded.jar.sha1 deleted file mode 100644 index 52b8215cd53c..000000000000 --- a/solr/licenses/jetty-start-12.1.10-shaded.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d2d1aed98485163fbe79d5e497a5e54f6701fdf3 diff --git a/solr/licenses/jetty-start-12.1.14-shaded.jar.sha1 b/solr/licenses/jetty-start-12.1.14-shaded.jar.sha1 new file mode 100644 index 000000000000..34fd0008c159 --- /dev/null +++ b/solr/licenses/jetty-start-12.1.14-shaded.jar.sha1 @@ -0,0 +1 @@ +9398fe90129da289c81a2be3915bd4f55475916c diff --git a/solr/licenses/jetty-util-12.1.10.jar.sha1 b/solr/licenses/jetty-util-12.1.10.jar.sha1 deleted file mode 100644 index cb1ecaaf368b..000000000000 --- a/solr/licenses/jetty-util-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dea1bd8e110853f3a0a15e8a8096faa2cf61e278 diff --git a/solr/licenses/jetty-util-12.1.14.jar.sha1 b/solr/licenses/jetty-util-12.1.14.jar.sha1 new file mode 100644 index 000000000000..411ea9d883b3 --- /dev/null +++ b/solr/licenses/jetty-util-12.1.14.jar.sha1 @@ -0,0 +1 @@ +b89abd671db08f3933bec0834bb6859be6ab957c diff --git a/solr/licenses/jetty-xml-12.1.10.jar.sha1 b/solr/licenses/jetty-xml-12.1.10.jar.sha1 deleted file mode 100644 index 06242e6a8322..000000000000 --- a/solr/licenses/jetty-xml-12.1.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e57126ad4023d4c86b24dffb0dacc9fce622828c diff --git a/solr/licenses/jetty-xml-12.1.14.jar.sha1 b/solr/licenses/jetty-xml-12.1.14.jar.sha1 new file mode 100644 index 000000000000..4fc362202c22 --- /dev/null +++ b/solr/licenses/jetty-xml-12.1.14.jar.sha1 @@ -0,0 +1 @@ +f198d16b964e15979e64a14c0a298c78e510c535 diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index 11c2394fed83..9fa6c7ff6ed7 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,test org.carrot2:morfologik-polish:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.carrot2:morfologik-stemming:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index 439ac593c6be..964bfa631cb6 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,runtimeClass org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.carrot2:carrot2-core:4.8.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index 77ead19c002a..1045267aa63a 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile index 3bed222adee3..0e64ccf8a645 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index ca081c89476f..024d743aa22b 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index 23ad4931c67f..c7a56529bf09 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,testRuntimeClasspath org.checkerframework:checker-qual:4.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.6.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index f0acb5fa8ce7..af799707c5c5 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -145,26 +145,26 @@ org.bouncycastle:bcpkix-jdk18on:1.85=jarValidation,testCompileClasspath,testRunt org.bouncycastle:bcprov-jdk18on:1.85=jarValidation,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcutil-jdk18on:1.85=jarValidation,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.freemarker:freemarker:2.3.34=jarValidation,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index 64c00e886533..4c5a0f344759 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile index 90d6e053d2f7..2609eb121b93 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index 3655d198d3cc..b7aff4334102 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index 4b313826d12b..482f23682e55 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 99391082e644..58a9c6c2f6ba 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index 6305398f71ca..86e550a736a9 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 4836266e17d2..1f21ed78bead 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,runtimeCl org.codehaus.janino:commons-compiler:3.1.12=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.codehaus.janino:janino:3.1.12=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index 714a732d8103..2a703c536b51 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,solrCore org.apache.zookeeper:zookeeper-jute:3.9.6=jarValidation,runtimeClasspath,solrCore org.apache.zookeeper:zookeeper:3.9.6=jarValidation,runtimeClasspath,solrCore org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,solrCore -org.eclipse.jetty:jetty-deploy:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty:jetty-jmx:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,runtimeClasspath,serverLib -org.eclipse.jetty:jetty-start:12.1.10=jarValidation,startJar -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore -org.eclipse.jetty:jetty-xml:12.1.10=jarValidation,runtimeClasspath,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,serverLib org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,solrCore org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,solrCore org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,solrCore diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index ea94c06f21b2..ea9f3c089f4b 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=testRuntimeClasspath org.codehaus.janino:commons-compiler:3.1.12=testRuntimeClasspath org.codehaus.janino:janino:3.1.12=testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=cliClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=cliClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=cliClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=cliClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=cliClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=cliClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=cliClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=cliClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=cliClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=cliClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=cliClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=cliClasspath,testRuntimeClasspath diff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfile index ec6a6e6f03e4..0d14117f4e33 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,tes org.apache.zookeeper:zookeeper:3.9.6=jarValidation,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index 40a0124c7208..f26cf967d5d5 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,testRuntimeClasspath org.codehaus.janino:commons-compiler:3.1.12=jarValidation,testRuntimeClasspath org.codehaus.janino:janino:3.1.12=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index 7c4747b45695..3f413c22128e 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath +org.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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 7420bc27d665..a802215216e8 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,tes org.apache.zookeeper:zookeeper:3.9.6=jarValidation,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-xml:12.1.10=jarValidation,testCompileClasspath,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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 9a7b62d5cc1e..ce8f078c5934 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,runtime org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-rewrite:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=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,testRuntimeClasspath org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index b40fad3f5820..6f0514963900 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -131,32 +131,32 @@ org.checkerframework:checker-qual:4.2.2=jarValidation,testRuntimeClasspath org.codehaus.janino:commons-compiler:3.1.12=jarValidation,testRuntimeClasspath org.codehaus.janino:janino:3.1.12=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.3.1=jarValidation,solrCore,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,solrCore,testRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,solrCore,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,serverLib,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.10=serverLib -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=serverLib -org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=serverLib -org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,solrCore,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,serverLib,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,solrCore,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,serverLib,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,serverLib,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.10=jarValidation,solrCore,testRuntimeClasspath -org.eclipse.jetty:jetty-deploy:12.1.10=serverLib -org.eclipse.jetty:jetty-http:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-jmx:12.1.10=serverLib -org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,serverLib,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.10=jarValidation,serverLib,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.10=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-xml:12.1.10=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=serverLib org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,solrCore,testRuntimeClasspath org.glassfish.hk2:hk2-api:4.0.1=jarValidation,solrCore,testRuntimeClasspath org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,solrCore,testRuntimeClasspath From 561e76e5e139358383cc49fd34a554fb40424f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Sat, 10 Oct 2026 22:28:54 +0100 Subject: [PATCH 4/4] SOLR-18297: remove superseded changelog entry for Jetty 12.0.34 The 12.0.34 bump is superseded by the 12.1.14 upgrade in this branch, so only one dependency_update entry should reach the 10.x changelog. --- changelog/unreleased/update-eclipse-jetty-12.0.34.yml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 changelog/unreleased/update-eclipse-jetty-12.0.34.yml diff --git a/changelog/unreleased/update-eclipse-jetty-12.0.34.yml b/changelog/unreleased/update-eclipse-jetty-12.0.34.yml deleted file mode 100644 index 52ba03f36019..000000000000 --- a/changelog/unreleased/update-eclipse-jetty-12.0.34.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update eclipse.jetty to v12.0.34 -type: dependency_update -authors: -- name: Jan Høydahl -links: -- name: PR#4305 - url: https://github.com/apache/solr/pull/4305