From 4409b27bf8f537a7dcc4b22802b5d2714707d354 Mon Sep 17 00:00:00 2001 From: Sanjay Dutt Date: Tue, 19 Nov 2024 22:54:18 +0530 Subject: [PATCH 1/8] Jetty12 + EE8 \u1F680 --- gradle/libs.versions.toml | 27 +- solr/core/build.gradle | 1 + .../handler/admin/ShowFileRequestHandler.java | 7 +- .../solr/security/AuthenticationPlugin.java | 2 +- .../apache/solr/security/BasicAuthPlugin.java | 5 +- .../apache/solr/security/MultiAuthPlugin.java | 2 +- .../security/PKIAuthenticationPlugin.java | 7 +- .../solr/update/SolrCmdDistributor.java | 2 +- .../solr/update/StreamingSolrClients.java | 2 +- .../InstrumentedHttpListenerFactory.java | 4 +- .../apache/solr/util/tracing/TraceUtils.java | 2 +- .../org/apache/solr/cli/PackageToolTest.java | 12 +- .../apache/solr/cloud/OverseerStatusTest.java | 1 + .../solr/core/TestSolrConfigHandler.java | 2 +- .../apache/solr/request/TestStreamBody.java | 2 +- .../apache/solr/rest/SolrRestletTestBase.java | 2 +- .../TestSerializedLuceneMatchVersion.java | 2 +- .../TestManagedStopFilterFactory.java | 2 +- .../TestManagedSynonymFilterFactory.java | 2 +- .../TestManagedSynonymGraphFilterFactory.java | 2 +- .../solr/schema/TestCloudSchemaless.java | 2 +- .../solr/servlet/HttpSolrCallCloudTest.java | 519 +++++++++++++++++- .../solr/servlet/TestRequestRateLimiter.java | 357 +++++++++++- .../tracing/TestHttpServletRequestGetter.java | 3 +- .../crossdc/manager/consumer/Consumer.java | 4 +- solr/licenses/http2-client-10.0.22.jar.sha1 | 1 - solr/licenses/http2-common-10.0.22.jar.sha1 | 1 - solr/licenses/http2-hpack-10.0.22.jar.sha1 | 1 - ...tp2-http-client-transport-10.0.22.jar.sha1 | 1 - solr/licenses/http2-server-10.0.22.jar.sha1 | 1 - .../jakarta.servlet-api-6.0.0.jar.sha1 | 1 + ...ersey-container-jetty-http-2.39.1.jar.sha1 | 1 - ...jersey-container-jetty-http-3.1.0.jar.sha1 | 1 + .../jetty-alpn-client-10.0.22.jar.sha1 | 1 - .../jetty-alpn-client-12.0.10.jar.sha1 | 1 + .../jetty-alpn-java-client-10.0.22.jar.sha1 | 1 - .../jetty-alpn-java-client-12.0.10.jar.sha1 | 1 + .../jetty-alpn-java-server-10.0.22.jar.sha1 | 1 - .../jetty-alpn-java-server-12.0.10.jar.sha1 | 1 + .../jetty-alpn-server-10.0.22.jar.sha1 | 1 - .../jetty-alpn-server-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-client-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-client-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-deploy-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-deploy-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-ee-12.0.10.jar.sha1 | 1 + .../jetty-ee10-servlet-12.0.10.jar.sha1 | 1 + .../jetty-ee8-nested-12.0.10.jar.sha1 | 1 + .../jetty-ee8-security-12.0.10.jar.sha1 | 1 + .../jetty-ee8-servlet-12.0.10.jar.sha1 | 1 + .../jetty-ee8-servlets-12.0.10.jar.sha1 | 1 + .../jetty-ee8-webapp-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-http-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-http-12.0.10.jar.sha1 | 1 + .../jetty-http2-client-12.0.10.jar.sha1 | 1 + ...ty-http2-client-transport-12.0.10.jar.sha1 | 1 + .../jetty-http2-common-12.0.10.jar.sha1 | 1 + .../jetty-http2-hpack-12.0.10.jar.sha1 | 1 + .../jetty-http2-server-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-io-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-io-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-jmx-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-jmx-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-rewrite-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-rewrite-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-security-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-security-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-server-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-server-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-servlet-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-servlets-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-session-12.0.10.jar.sha1 | 1 + .../jetty-start-10.0.22-shaded.jar.sha1 | 1 - .../jetty-start-12.0.10-shaded.jar.sha1 | 1 + solr/licenses/jetty-util-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-util-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-webapp-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-xml-10.0.22.jar.sha1 | 1 - solr/licenses/jetty-xml-12.0.10.jar.sha1 | 1 + solr/licenses/metrics-jetty10-4.2.26.jar.sha1 | 1 - solr/licenses/metrics-jetty12-4.2.26.jar.sha1 | 1 + .../metrics-jetty12-ee10-4.2.26.jar.sha1 | 1 + solr/modules/hadoop-auth/build.gradle | 2 +- ...ConfigurableInternodeAuthHadoopPlugin.java | 2 +- .../solr/security/hadoop/KerberosPlugin.java | 4 +- .../solrj/impl/Krb5HttpClientUtils.java | 4 +- .../HttpParamDelegationTokenPlugin.java | 8 +- .../solr/security/jwt/JWTAuthPlugin.java | 2 +- solr/server/build.gradle | 2 + solr/solrj/build.gradle | 1 + .../solrj/impl/AuthenticationStoreHolder.java | 6 +- .../impl/ConcurrentUpdateHttp2SolrClient.java | 4 +- .../client/solrj/impl/Http2SolrClient.java | 50 +- .../solrj/impl/HttpListenerFactory.java | 6 +- .../solrj/impl/Krb5HttpClientBuilder.java | 4 +- ...eemptiveBasicAuthClientBuilderFactory.java | 2 +- .../solrj/util/SolrBasicAuthentication.java | 8 +- .../solr/client/solrj/StartSolrJetty.java | 2 +- .../solrj/embedded/JettyWebappTest.java | 8 +- .../solrj/impl/BasicHttpSolrClientTest.java | 2 +- .../ConcurrentUpdateHttp2SolrClientTest.java | 4 +- .../impl/ConcurrentUpdateSolrClientTest.java | 2 +- .../Http2SolrClientCompatibilityTest.java | 6 +- .../solrj/impl/HttpSolrClientTestBase.java | 2 +- .../solr/client/solrj/request/SchemaTest.java | 2 +- solr/test-framework/build.gradle | 6 +- .../solr/BaseDistributedSearchTestCase.java | 2 +- .../org/apache/solr/SolrJettyTestBase.java | 2 +- .../solr/cloud/MiniSolrCloudCluster.java | 10 +- .../org/apache/solr/embedded/JettyConfig.java | 2 +- .../apache/solr/embedded/JettySolrRunner.java | 31 +- .../org/apache/solr/util/RestTestBase.java | 2 +- .../org/apache/solr/util/SSLTestConfig.java | 4 +- versions.lock | 54 +- 114 files changed, 1066 insertions(+), 210 deletions(-) delete mode 100644 solr/licenses/http2-client-10.0.22.jar.sha1 delete mode 100644 solr/licenses/http2-common-10.0.22.jar.sha1 delete mode 100644 solr/licenses/http2-hpack-10.0.22.jar.sha1 delete mode 100644 solr/licenses/http2-http-client-transport-10.0.22.jar.sha1 delete mode 100644 solr/licenses/http2-server-10.0.22.jar.sha1 create mode 100644 solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 delete mode 100644 solr/licenses/jersey-container-jetty-http-2.39.1.jar.sha1 create mode 100644 solr/licenses/jersey-container-jetty-http-3.1.0.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-client-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-client-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-java-client-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-java-client-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-java-server-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-java-server-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-alpn-server-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-alpn-server-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-client-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-client-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-deploy-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-deploy-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-servlet-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee8-nested-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee8-security-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee8-servlet-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee8-servlets-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee8-webapp-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-http-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-http-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-http2-client-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-http2-client-transport-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-http2-common-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-http2-hpack-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-http2-server-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-io-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-io-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-jmx-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-jmx-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-rewrite-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-rewrite-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-security-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-security-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-server-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-server-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-servlet-10.0.22.jar.sha1 delete mode 100644 solr/licenses/jetty-servlets-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-session-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-start-10.0.22-shaded.jar.sha1 create mode 100644 solr/licenses/jetty-start-12.0.10-shaded.jar.sha1 delete mode 100644 solr/licenses/jetty-util-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-util-12.0.10.jar.sha1 delete mode 100644 solr/licenses/jetty-webapp-10.0.22.jar.sha1 delete mode 100644 solr/licenses/jetty-xml-10.0.22.jar.sha1 create mode 100644 solr/licenses/jetty-xml-12.0.10.jar.sha1 delete mode 100644 solr/licenses/metrics-jetty10-4.2.26.jar.sha1 create mode 100644 solr/licenses/metrics-jetty12-4.2.26.jar.sha1 create mode 100644 solr/licenses/metrics-jetty12-ee10-4.2.26.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5bfb64e36d8..eb7ce67baa6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -82,7 +82,8 @@ cybozulabs-langdetect = "1.1-20120112" diffplug-spotless = "6.5.2" dropwizard-metrics = "4.2.26" eclipse-ecj = "3.39.0" -eclipse-jetty = "10.0.22" +# eclipse-jetty = "10.0.22" +eclipse-jetty = "12.0.10" eclipse-jettytoolchain = "4.0.6" # @keep jgit version used by git-status.gradle eclipse-jgit = "6.7.0.202309050840-r" @@ -138,7 +139,7 @@ jayway-jsonpath = "2.9.0" jctools = "4.0.5" jersey = "3.1.9" # TODO Sync with jersey versions -jersey-containers = "2.39.1" +jersey-containers = "3.1.0" # @keep for version alignment joda-time = "2.8.1" junit = "4.13.2" @@ -295,7 +296,7 @@ bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk18on", version.ref carrot2-core = { module = "org.carrot2:carrot2-core", version.ref = "carrot2-core" } carrotsearch-hppc = { module = "com.carrotsearch:hppc", version.ref = "carrotsearch-hppc" } carrotsearch-randomizedtesting-runner = { module = "com.carrotsearch.randomizedtesting:randomizedtesting-runner", version.ref = "carrotsearch-randomizedtesting" } -# @keep transitive dependency for version alignment +# @keep transitive depenxdency for version alignment checkerframework-qual = { module = "org.checkerframework:checker-qual", version.ref = "checkerframework" } codehaus-woodstox-stax2api = { module = "org.codehaus.woodstox:stax2-api", version.ref = "codehaus-woodstox" } commonscli-commonscli = { module = "commons-cli:commons-cli", version.ref = "commons-cli" } @@ -305,7 +306,7 @@ commonsio-commonsio = { module = "commons-io:commons-io", version.ref = "commons cybozulabs-langdetect = { module = "com.cybozu.labs:langdetect", version.ref = "cybozulabs-langdetect" } dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizard-metrics" } dropwizard-metrics-graphite = { module = "io.dropwizard.metrics:metrics-graphite", version.ref = "dropwizard-metrics" } -dropwizard-metrics-jetty10 = { module = "io.dropwizard.metrics:metrics-jetty10", version.ref = "dropwizard-metrics" } +dropwizard-metrics-jetty10 = { module = "io.dropwizard.metrics:metrics-jetty12-ee10", version.ref = "dropwizard-metrics" } dropwizard-metrics-jmx = { module = "io.dropwizard.metrics:metrics-jmx", version.ref = "dropwizard-metrics" } dropwizard-metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version.ref = "dropwizard-metrics" } dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-servlets", version.ref = "dropwizard-metrics" } @@ -315,23 +316,25 @@ eclipse-jetty-alpnjavaserver = { module = "org.eclipse.jetty:jetty-alpn-java-ser eclipse-jetty-alpnserver = { module = "org.eclipse.jetty:jetty-alpn-server", version.ref = "eclipse-jetty" } eclipse-jetty-client = { module = "org.eclipse.jetty:jetty-client", version.ref = "eclipse-jetty" } eclipse-jetty-deploy = { module = "org.eclipse.jetty:jetty-deploy", version.ref = "eclipse-jetty" } +eclipse-jetty-ee8-nested = { module = "org.eclipse.jetty.ee8:jetty-ee8-nested", version.ref = "eclipse-jetty" } eclipse-jetty-http = { module = "org.eclipse.jetty:jetty-http", version.ref = "eclipse-jetty" } -eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:http2-client", version.ref = "eclipse-jetty" } -eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:http2-common", version.ref = "eclipse-jetty" } -eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:http2-hpack", version.ref = "eclipse-jetty" } -eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:http2-http-client-transport", version.ref = "eclipse-jetty" } -eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:http2-server", version.ref = "eclipse-jetty" } +eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:jetty-http2-client", version.ref = "eclipse-jetty" } +eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:jetty-http2-common", version.ref = "eclipse-jetty" } +eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:jetty-http2-hpack", version.ref = "eclipse-jetty" } +eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:jetty-http2-client-transport", version.ref = "eclipse-jetty" } +eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:jetty-http2-server", version.ref = "eclipse-jetty" } eclipse-jetty-io = { module = "org.eclipse.jetty:jetty-io", version.ref = "eclipse-jetty" } eclipse-jetty-jmx = { module = "org.eclipse.jetty:jetty-jmx", version.ref = "eclipse-jetty" } eclipse-jetty-rewrite = { module = "org.eclipse.jetty:jetty-rewrite", version.ref = "eclipse-jetty" } eclipse-jetty-security = { module = "org.eclipse.jetty:jetty-security", version.ref = "eclipse-jetty" } eclipse-jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "eclipse-jetty" } -eclipse-jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "eclipse-jetty" } -eclipse-jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets", version.ref = "eclipse-jetty" } +eclipse-jetty-servlet = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlet", version.ref = "eclipse-jetty" } +eclipse-jetty-servlets = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlets", version.ref = "eclipse-jetty" } +eclipse-jetty-session = { module = "org.eclipse.jetty:jetty-session", version.ref = "eclipse-jetty" } eclipse-jetty-start = { module = "org.eclipse.jetty:jetty-start", version.ref = "eclipse-jetty" } eclipse-jetty-toolchain-servletapi = { module = "org.eclipse.jetty.toolchain:jetty-servlet-api", version.ref = "eclipse-jettytoolchain" } eclipse-jetty-util = { module = "org.eclipse.jetty:jetty-util", version.ref = "eclipse-jetty" } -eclipse-jetty-webapp = { module = "org.eclipse.jetty:jetty-webapp", version.ref = "eclipse-jetty" } +eclipse-jetty-webapp = { module = "org.eclipse.jetty.ee8:jetty-ee8-webapp", version.ref = "eclipse-jetty" } eclipse-jetty-xml = { module = "org.eclipse.jetty:jetty-xml", version.ref = "eclipse-jetty" } eclipse-jgit-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit" } fasterxml-jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "fasterxml" } diff --git a/solr/core/build.gradle b/solr/core/build.gradle index f406f842201..36dd3cbf507 100644 --- a/solr/core/build.gradle +++ b/solr/core/build.gradle @@ -195,6 +195,7 @@ dependencies { testImplementation libs.eclipse.jetty.server testImplementation libs.eclipse.jetty.servlet + testImplementation libs.eclipse.jetty.util testImplementation libs.carrotsearch.randomizedtesting.runner testImplementation libs.junit.junit diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java index e2d8b7715b8..d8937ecf58c 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java @@ -100,9 +100,14 @@ public class ShowFileRequestHandler extends RequestHandlerBase implements Permis private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); static { - KNOWN_MIME_TYPES = new HashSet<>(MimeTypes.getKnownMimeTypes()); + KNOWN_MIME_TYPES = new HashSet<>(); + for (MimeTypes.Type type : MimeTypes.Type.values()) { + KNOWN_MIME_TYPES.add(type.toString()); + } KNOWN_MIME_TYPES.add("text/xml"); KNOWN_MIME_TYPES.add("text/javascript"); + KNOWN_MIME_TYPES.add("text/csv"); + KNOWN_MIME_TYPES.add("application/xhtml+xml"); } public ShowFileRequestHandler() { diff --git a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java index 1bd637bb13f..eb6221b2015 100644 --- a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java @@ -31,7 +31,7 @@ import org.apache.http.protocol.HttpContext; import org.apache.solr.core.SolrInfoBean; import org.apache.solr.metrics.SolrMetricsContext; -import org.eclipse.jetty.client.api.Request; +import org.eclipse.jetty.client.Request; /** * @lucene.experimental diff --git a/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java b/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java index cadc4fed946..70ab5a985b7 100644 --- a/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java @@ -47,7 +47,7 @@ import org.apache.solr.common.SpecProvider; import org.apache.solr.common.util.CommandOperation; import org.apache.solr.common.util.ValidatingJsonMap; -import org.eclipse.jetty.client.api.Request; +import org.eclipse.jetty.client.Request; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -252,7 +252,8 @@ protected boolean interceptInternodeRequest(Request request) { .encodeToString( (principal.getName() + ":" + principal.getPassword()) .getBytes(StandardCharsets.UTF_8)); - request.header(HttpHeaders.AUTHORIZATION, "Basic " + userPassBase64); + request.headers( + httpFields -> httpFields.add(HttpHeaders.AUTHORIZATION, "Basic " + userPassBase64)); return true; } } diff --git a/solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java b/solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java index 5027cec6377..d96ead676a3 100644 --- a/solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java @@ -42,7 +42,7 @@ import org.apache.solr.core.CoreContainer; import org.apache.solr.handler.admin.api.ModifyMultiPluginAuthConfigAPI; import org.apache.solr.metrics.SolrMetricsContext; -import org.eclipse.jetty.client.api.Request; +import org.eclipse.jetty.client.Request; /** * Authentication plugin that supports multiple Authorization schemes, such as Bearer and Basic. The diff --git a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java index b1f6e6b6eed..7434670e821 100644 --- a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java @@ -57,7 +57,7 @@ import org.apache.solr.core.CoreContainer; import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.util.CryptoKeys; -import org.eclipse.jetty.client.api.Request; +import org.eclipse.jetty.client.Request; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -414,11 +414,12 @@ public void onBegin(Request request) { if ("v1".equals(System.getProperty(SEND_VERSION))) { preFetchedUser .map(PKIAuthenticationPlugin.this::generateToken) - .ifPresent(token -> request.header(HEADER, token)); + .ifPresent(token -> request.headers(httpFields -> httpFields.add(HEADER, token))); } else { preFetchedUser .map(PKIAuthenticationPlugin.this::generateTokenV2) - .ifPresent(token -> request.header(HEADER_V2, token)); + .ifPresent( + token -> request.headers(httpFields -> httpFields.add(HEADER_V2, token))); } } diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java index 7f1998d6c82..477e203e2dd 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java +++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java @@ -431,7 +431,7 @@ public String toString() { // care when assembling the final response to check both the rollup and leader trackers on the // aggregator node. public void trackRequestResult( - org.eclipse.jetty.client.api.Response resp, InputStream respBody, boolean success) { + org.eclipse.jetty.client.Response resp, InputStream respBody, boolean success) { // Returning Integer.MAX_VALUE here means there was no "rf" on the response, therefore we just // need to increment our achieved rf if we are a leader, i.e. have a leaderTracker. diff --git a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java index 51381f4a582..5790fcf9aea 100644 --- a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java +++ b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java @@ -32,7 +32,7 @@ import org.apache.solr.common.SolrException; import org.apache.solr.common.util.StrUtils; import org.apache.solr.update.SolrCmdDistributor.SolrError; -import org.eclipse.jetty.client.api.Response; +import org.eclipse.jetty.client.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpListenerFactory.java b/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpListenerFactory.java index d91d1f83b68..6af4bccaad3 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpListenerFactory.java +++ b/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpListenerFactory.java @@ -29,8 +29,8 @@ import org.apache.solr.metrics.SolrMetricProducer; import org.apache.solr.metrics.SolrMetricsContext; import org.apache.solr.util.tracing.TraceUtils; -import org.eclipse.jetty.client.api.Request; -import org.eclipse.jetty.client.api.Result; +import org.eclipse.jetty.client.Request; +import org.eclipse.jetty.client.Result; /** * A HttpListenerFactory tracking metrics and distributed tracing. The Metrics are inspired and diff --git a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java index 63f8cd0d04c..5f847590c58 100644 --- a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java +++ b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java @@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.http.HttpRequest; import org.apache.solr.request.SolrQueryRequest; -import org.eclipse.jetty.client.api.Request; +import org.eclipse.jetty.client.Request; /** Utilities for distributed tracing. */ public class TraceUtils { diff --git a/solr/core/src/test/org/apache/solr/cli/PackageToolTest.java b/solr/core/src/test/org/apache/solr/cli/PackageToolTest.java index fa75ba3206e..e4c106808a7 100644 --- a/solr/core/src/test/org/apache/solr/cli/PackageToolTest.java +++ b/solr/core/src/test/org/apache/solr/cli/PackageToolTest.java @@ -35,8 +35,8 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.DefaultHandler; -import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.server.handler.ResourceHandler; +import org.eclipse.jetty.util.resource.PathResourceFactory; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -402,13 +402,13 @@ public void start() throws Exception { server.setStopAtShutdown(true); ResourceHandler resourceHandler = new ResourceHandler(); - resourceHandler.setResourceBase(resourceDir); - resourceHandler.setDirectoriesListed(true); + resourceHandler.setBaseResource(new PathResourceFactory().newResource(resourceDir)); - HandlerList handlers = new HandlerList(); - handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()}); - server.setHandler(handlers); + Handler.Sequence sequence = new Handler.Sequence(); + sequence.addHandler(resourceHandler); + sequence.addHandler(new DefaultHandler()); + server.setHandler(sequence); server.start(); } diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java index 8e99d751854..f0adf7f2991 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java @@ -24,6 +24,7 @@ import org.junit.BeforeClass; import org.junit.Test; +// @LogLevel("org.eclipse.jetty=DEBUG") public class OverseerStatusTest extends SolrCloudTestCase { @BeforeClass diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java index 9ef6256d991..c4307eefd83 100644 --- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java +++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java @@ -53,7 +53,7 @@ import org.apache.solr.util.RestTestBase; import org.apache.solr.util.RestTestHarness; import org.apache.solr.util.TimeOut; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.After; import org.junit.Before; import org.noggit.JSONParser; diff --git a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java index 197fd2d5986..d16b3fc5508 100644 --- a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java +++ b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java @@ -26,7 +26,7 @@ import org.apache.solr.common.SolrException; import org.apache.solr.common.params.CommonParams; import org.apache.solr.util.RestTestBase; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.After; import org.junit.Test; import org.slf4j.Logger; diff --git a/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java b/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java index 59d2a35d88c..f517731e15c 100644 --- a/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java +++ b/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java @@ -21,7 +21,7 @@ import java.util.SortedMap; import java.util.TreeMap; import org.apache.solr.util.RestTestBase; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.BeforeClass; /** diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java index 463861f517e..3c7f045a6e6 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java @@ -19,7 +19,7 @@ import java.util.SortedMap; import java.util.TreeMap; import org.apache.solr.util.RestTestBase; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.BeforeClass; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java index d3aa476693c..b4f1a52b2c3 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java @@ -23,7 +23,7 @@ import org.apache.commons.io.FileUtils; import org.apache.solr.common.util.Utils; import org.apache.solr.util.RestTestBase; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java index 4738196017c..96a45b77651 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java @@ -29,7 +29,7 @@ import java.util.TreeMap; import org.apache.commons.io.file.PathUtils; import org.apache.solr.util.RestTestBase; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java index f27bdbc0d5d..f3bbbb96241 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java @@ -31,7 +31,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.file.PathUtils; import org.apache.solr.util.RestTestBase; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java b/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java index 0bb42c3afd8..923ac36baf4 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java +++ b/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java @@ -30,7 +30,7 @@ import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.util.BaseTestHarness; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.After; import org.junit.Test; import org.slf4j.Logger; diff --git a/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java b/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java index 7fff377d3a3..fde766871fb 100644 --- a/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java +++ b/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java @@ -17,22 +17,43 @@ package org.apache.solr.servlet; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.URI; +import java.security.Principal; +import java.util.Collection; +import java.util.Enumeration; import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; import java.util.Set; +import javax.servlet.AsyncContext; +import javax.servlet.DispatcherType; import javax.servlet.ReadListener; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.UnavailableException; import javax.servlet.WriteListener; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpUpgradeHandler; +import javax.servlet.http.Part; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.cloud.AbstractDistribZkTestBase; import org.apache.solr.cloud.SolrCloudTestCase; import org.apache.solr.embedded.JettySolrRunner; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.Response; import org.junit.BeforeClass; import org.junit.Test; @@ -93,40 +114,66 @@ private void assertCoreChosen(int numCores, TestRequest testRequest) throws Unav assertEquals(numCores, coreNames.size()); } - private static class TestResponse extends Response { + public static class TestRequest implements HttpServletRequest { + private final String path; - public TestResponse() { - super(null, null); + public TestRequest(String path) { + this.path = path; } @Override - public ServletOutputStream getOutputStream() { - return new ServletOutputStream() { - @Override - public boolean isReady() { - return true; - } + public String getAuthType() { + return ""; + } - @Override - public void setWriteListener(WriteListener writeListener) {} + @Override + public Cookie[] getCookies() { + return new Cookie[0]; + } - @Override - public void write(int b) {} - }; + @Override + public long getDateHeader(String name) { + return 0; } @Override - public boolean isCommitted() { - return true; + public String getHeader(String name) { + return ""; } - } - private static class TestRequest extends Request { - private String path; + @Override + public Enumeration getHeaders(String name) { + return null; + } - public TestRequest(String path) { - super(null, null); - this.path = path; + @Override + public Enumeration getHeaderNames() { + return null; + } + + @Override + public int getIntHeader(String name) { + return 0; + } + + @Override + public String getMethod() { + return ""; + } + + @Override + public String getPathInfo() { + return ""; + } + + @Override + public String getPathTranslated() { + return ""; + } + + @Override + public String getContextPath() { + return ""; } @Override @@ -135,13 +182,23 @@ public String getQueryString() { } @Override - public String getContentType() { - return "application/json"; + public String getRemoteUser() { + return ""; } @Override - public String getServletPath() { - return path; + public boolean isUserInRole(String role) { + return false; + } + + @Override + public Principal getUserPrincipal() { + return null; + } + + @Override + public String getRequestedSessionId() { + return ""; } @Override @@ -150,7 +207,112 @@ public String getRequestURI() { } @Override - public ServletInputStream getInputStream() { + public StringBuffer getRequestURL() { + return null; + } + + @Override + public String getServletPath() { + return path; + } + + @Override + public HttpSession getSession(boolean create) { + return null; + } + + @Override + public HttpSession getSession() { + return null; + } + + @Override + public String changeSessionId() { + return ""; + } + + @Override + public boolean isRequestedSessionIdValid() { + return false; + } + + @Override + public boolean isRequestedSessionIdFromCookie() { + return false; + } + + @Override + public boolean isRequestedSessionIdFromURL() { + return false; + } + + @Override + public boolean isRequestedSessionIdFromUrl() { + return false; + } + + @Override + public boolean authenticate(HttpServletResponse response) throws IOException, ServletException { + return false; + } + + @Override + public void login(String username, String password) throws ServletException {} + + @Override + public void logout() throws ServletException {} + + @Override + public Collection getParts() throws IOException, ServletException { + return List.of(); + } + + @Override + public Part getPart(String name) throws IOException, ServletException { + return null; + } + + @Override + public T upgrade(Class handlerClass) + throws IOException, ServletException { + return null; + } + + @Override + public Object getAttribute(String name) { + return null; + } + + @Override + public Enumeration getAttributeNames() { + return null; + } + + @Override + public String getCharacterEncoding() { + return ""; + } + + @Override + public void setCharacterEncoding(String env) throws UnsupportedEncodingException {} + + @Override + public int getContentLength() { + return 0; + } + + @Override + public long getContentLengthLong() { + return 0; + } + + @Override + public String getContentType() { + return "application/json"; + } + + @Override + public ServletInputStream getInputStream() throws IOException { return new ServletInputStream() { @Override public boolean isFinished() { @@ -171,5 +333,304 @@ public int read() { } }; } + + @Override + public String getParameter(String name) { + return ""; + } + + @Override + public Enumeration getParameterNames() { + return null; + } + + @Override + public String[] getParameterValues(String name) { + return new String[0]; + } + + @Override + public Map getParameterMap() { + return Map.of(); + } + + @Override + public String getProtocol() { + return ""; + } + + @Override + public String getScheme() { + return ""; + } + + @Override + public String getServerName() { + return ""; + } + + @Override + public int getServerPort() { + return 0; + } + + @Override + public BufferedReader getReader() throws IOException { + return null; + } + + @Override + public String getRemoteAddr() { + return ""; + } + + @Override + public String getRemoteHost() { + return ""; + } + + @Override + public void setAttribute(String name, Object o) {} + + @Override + public void removeAttribute(String name) {} + + @Override + public Locale getLocale() { + return null; + } + + @Override + public Enumeration getLocales() { + return null; + } + + @Override + public boolean isSecure() { + return false; + } + + @Override + public RequestDispatcher getRequestDispatcher(String path) { + return null; + } + + @Override + public String getRealPath(String path) { + return ""; + } + + @Override + public int getRemotePort() { + return 0; + } + + @Override + public String getLocalName() { + return ""; + } + + @Override + public String getLocalAddr() { + return ""; + } + + @Override + public int getLocalPort() { + return 0; + } + + @Override + public ServletContext getServletContext() { + return null; + } + + @Override + public AsyncContext startAsync() throws IllegalStateException { + return null; + } + + @Override + public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) + throws IllegalStateException { + return null; + } + + @Override + public boolean isAsyncStarted() { + return false; + } + + @Override + public boolean isAsyncSupported() { + return false; + } + + @Override + public AsyncContext getAsyncContext() { + return null; + } + + @Override + public DispatcherType getDispatcherType() { + return null; + } + } + + public static class TestResponse implements HttpServletResponse { + + @Override + public void addCookie(Cookie cookie) {} + + @Override + public boolean containsHeader(String name) { + return false; + } + + @Override + public String encodeURL(String url) { + return ""; + } + + @Override + public String encodeRedirectURL(String url) { + return ""; + } + + @Override + public String encodeUrl(String url) { + return ""; + } + + @Override + public String encodeRedirectUrl(String url) { + return ""; + } + + @Override + public void sendError(int sc, String msg) throws IOException {} + + @Override + public void sendError(int sc) throws IOException {} + + @Override + public void sendRedirect(String location) throws IOException {} + + @Override + public void setDateHeader(String name, long date) {} + + @Override + public void addDateHeader(String name, long date) {} + + @Override + public void setHeader(String name, String value) {} + + @Override + public void addHeader(String name, String value) {} + + @Override + public void setIntHeader(String name, int value) {} + + @Override + public void addIntHeader(String name, int value) {} + + @Override + public void setStatus(int sc) {} + + @Override + public void setStatus(int sc, String sm) {} + + @Override + public int getStatus() { + return 0; + } + + @Override + public String getHeader(String name) { + return ""; + } + + @Override + public Collection getHeaders(String name) { + return List.of(); + } + + @Override + public Collection getHeaderNames() { + return List.of(); + } + + @Override + public String getCharacterEncoding() { + return ""; + } + + @Override + public String getContentType() { + return ""; + } + + @Override + public ServletOutputStream getOutputStream() throws IOException { + return new ServletOutputStream() { + @Override + public boolean isReady() { + return true; + } + + @Override + public void setWriteListener(WriteListener writeListener) {} + + @Override + public void write(int b) {} + }; + } + + @Override + public PrintWriter getWriter() throws IOException { + return null; + } + + @Override + public void setCharacterEncoding(String charset) {} + + @Override + public void setContentLength(int len) {} + + @Override + public void setContentLengthLong(long len) {} + + @Override + public void setContentType(String type) {} + + @Override + public void setBufferSize(int size) {} + + @Override + public int getBufferSize() { + return 0; + } + + @Override + public void flushBuffer() throws IOException {} + + @Override + public void resetBuffer() {} + + @Override + public boolean isCommitted() { + return true; + } + + @Override + public void reset() {} + + @Override + public void setLocale(Locale loc) {} + + @Override + public Locale getLocale() { + return null; + } } } diff --git a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java index cbe18c8431c..a571243b381 100644 --- a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java +++ b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java @@ -23,10 +23,17 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.instanceOf; +import java.io.BufferedReader; import java.io.Closeable; import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.security.Principal; import java.util.ArrayList; +import java.util.Collection; +import java.util.Enumeration; import java.util.List; +import java.util.Locale; +import java.util.Map; import java.util.Random; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; @@ -37,7 +44,20 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.LongAdder; +import javax.servlet.AsyncContext; +import javax.servlet.DispatcherType; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpUpgradeHandler; +import javax.servlet.http.Part; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrRequest; @@ -50,7 +70,6 @@ import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.util.ExecutorUtil; import org.apache.solr.core.RateLimiterConfig; -import org.eclipse.jetty.server.Request; import org.junit.BeforeClass; import org.junit.Test; @@ -277,17 +296,30 @@ public void testSlotBorrowingAcquisitionTimeout() private static final HttpServletRequest QUERY_REQ = new DummyRequest(null, "QUERY"); private static final HttpServletRequest UPDATE_REQ = new DummyRequest(null, "UPDATE"); - private static class DummyRequest extends Request { - + private static class DummyRequest implements HttpServletRequest { private final String ctx; private final String type; public DummyRequest(String ctx, String type) { - super(null, null); this.ctx = ctx; this.type = type; } + @Override + public String getAuthType() { + return ""; + } + + @Override + public Cookie[] getCookies() { + return new Cookie[0]; + } + + @Override + public long getDateHeader(String name) { + return 0; + } + @Override public String getHeader(String name) { switch (name) { @@ -299,6 +331,323 @@ public String getHeader(String name) { throw new IllegalArgumentException(); } } + + @Override + public Enumeration getHeaders(String name) { + return null; + } + + @Override + public Enumeration getHeaderNames() { + return null; + } + + @Override + public int getIntHeader(String name) { + return 0; + } + + @Override + public String getMethod() { + return ""; + } + + @Override + public String getPathInfo() { + return ""; + } + + @Override + public String getPathTranslated() { + return ""; + } + + @Override + public String getContextPath() { + return ""; + } + + @Override + public String getQueryString() { + return ""; + } + + @Override + public String getRemoteUser() { + return ""; + } + + @Override + public boolean isUserInRole(String role) { + return false; + } + + @Override + public Principal getUserPrincipal() { + return null; + } + + @Override + public String getRequestedSessionId() { + return ""; + } + + @Override + public String getRequestURI() { + return ""; + } + + @Override + public StringBuffer getRequestURL() { + return null; + } + + @Override + public String getServletPath() { + return ""; + } + + @Override + public HttpSession getSession(boolean create) { + return null; + } + + @Override + public HttpSession getSession() { + return null; + } + + @Override + public String changeSessionId() { + return ""; + } + + @Override + public boolean isRequestedSessionIdValid() { + return false; + } + + @Override + public boolean isRequestedSessionIdFromCookie() { + return false; + } + + @Override + public boolean isRequestedSessionIdFromURL() { + return false; + } + + @Override + public boolean isRequestedSessionIdFromUrl() { + return false; + } + + @Override + public boolean authenticate(HttpServletResponse response) throws IOException, ServletException { + return false; + } + + @Override + public void login(String username, String password) throws ServletException {} + + @Override + public void logout() throws ServletException {} + + @Override + public Collection getParts() throws IOException, ServletException { + return List.of(); + } + + @Override + public Part getPart(String name) throws IOException, ServletException { + return null; + } + + @Override + public T upgrade(Class handlerClass) + throws IOException, ServletException { + return null; + } + + @Override + public Object getAttribute(String name) { + return null; + } + + @Override + public Enumeration getAttributeNames() { + return null; + } + + @Override + public String getCharacterEncoding() { + return ""; + } + + @Override + public void setCharacterEncoding(String env) throws UnsupportedEncodingException {} + + @Override + public int getContentLength() { + return 0; + } + + @Override + public long getContentLengthLong() { + return 0; + } + + @Override + public String getContentType() { + return ""; + } + + @Override + public ServletInputStream getInputStream() throws IOException { + return null; + } + + @Override + public String getParameter(String name) { + return ""; + } + + @Override + public Enumeration getParameterNames() { + return null; + } + + @Override + public String[] getParameterValues(String name) { + return new String[0]; + } + + @Override + public Map getParameterMap() { + return Map.of(); + } + + @Override + public String getProtocol() { + return ""; + } + + @Override + public String getScheme() { + return ""; + } + + @Override + public String getServerName() { + return ""; + } + + @Override + public int getServerPort() { + return 0; + } + + @Override + public BufferedReader getReader() throws IOException { + return null; + } + + @Override + public String getRemoteAddr() { + return ""; + } + + @Override + public String getRemoteHost() { + return ""; + } + + @Override + public void setAttribute(String name, Object o) {} + + @Override + public void removeAttribute(String name) {} + + @Override + public Locale getLocale() { + return null; + } + + @Override + public Enumeration getLocales() { + return null; + } + + @Override + public boolean isSecure() { + return false; + } + + @Override + public RequestDispatcher getRequestDispatcher(String path) { + return null; + } + + @Override + public String getRealPath(String path) { + return ""; + } + + @Override + public int getRemotePort() { + return 0; + } + + @Override + public String getLocalName() { + return ""; + } + + @Override + public String getLocalAddr() { + return ""; + } + + @Override + public int getLocalPort() { + return 0; + } + + @Override + public ServletContext getServletContext() { + return null; + } + + @Override + public AsyncContext startAsync() throws IllegalStateException { + return null; + } + + @Override + public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) + throws IllegalStateException { + return null; + } + + @Override + public boolean isAsyncStarted() { + return false; + } + + @Override + public boolean isAsyncSupported() { + return false; + } + + @Override + public AsyncContext getAsyncContext() { + return null; + } + + @Override + public DispatcherType getDispatcherType() { + return null; + } } @Nightly diff --git a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java index d2b5fdf9bbb..9b07a29755d 100644 --- a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java +++ b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java @@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import org.apache.solr.SolrTestCase; -import org.eclipse.jetty.server.Request; import org.junit.Test; public class TestHttpServletRequestGetter extends SolrTestCase { @@ -41,7 +40,7 @@ public void test() { "c", Set.of("2")); HttpServletRequest req = - new HttpServletRequestWrapper(new Request(null, null)) { + new HttpServletRequestWrapper(null) { @Override public String getHeader(String name) { diff --git a/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java b/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java index b602152e05f..81ef3440a35 100644 --- a/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java +++ b/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java @@ -36,9 +36,9 @@ import org.apache.solr.crossdc.common.ConfUtil; import org.apache.solr.crossdc.common.KafkaCrossDcConf; import org.apache.solr.crossdc.common.SensitivePropRedactionUtils; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletMapping; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletMapping; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/licenses/http2-client-10.0.22.jar.sha1 b/solr/licenses/http2-client-10.0.22.jar.sha1 deleted file mode 100644 index 0625bf893c0..00000000000 --- a/solr/licenses/http2-client-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ab56d4454a9724e62b2588164c884a6940c0e62a diff --git a/solr/licenses/http2-common-10.0.22.jar.sha1 b/solr/licenses/http2-common-10.0.22.jar.sha1 deleted file mode 100644 index ae830c8b491..00000000000 --- a/solr/licenses/http2-common-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -06437d043c3e6265cf57ff287fc4877c4e8e3507 diff --git a/solr/licenses/http2-hpack-10.0.22.jar.sha1 b/solr/licenses/http2-hpack-10.0.22.jar.sha1 deleted file mode 100644 index 224ebb16783..00000000000 --- a/solr/licenses/http2-hpack-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c05f5b48ae78a829e623ba87cf2f067ce1225fcc diff --git a/solr/licenses/http2-http-client-transport-10.0.22.jar.sha1 b/solr/licenses/http2-http-client-transport-10.0.22.jar.sha1 deleted file mode 100644 index 34157c529cb..00000000000 --- a/solr/licenses/http2-http-client-transport-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8b5d6aab1bc2d9c19d070cd21885a6a2841698ec diff --git a/solr/licenses/http2-server-10.0.22.jar.sha1 b/solr/licenses/http2-server-10.0.22.jar.sha1 deleted file mode 100644 index 0bd57199207..00000000000 --- a/solr/licenses/http2-server-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4898419e9832dc6ccffc1fd44bfaaa239f2a8ed7 diff --git a/solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 b/solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 new file mode 100644 index 00000000000..2cecca548df --- /dev/null +++ b/solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 @@ -0,0 +1 @@ +abecc699286e65035ebba9844c03931357a6a963 diff --git a/solr/licenses/jersey-container-jetty-http-2.39.1.jar.sha1 b/solr/licenses/jersey-container-jetty-http-2.39.1.jar.sha1 deleted file mode 100644 index 7b88cb1acff..00000000000 --- a/solr/licenses/jersey-container-jetty-http-2.39.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -24bf9bf446f1899b35e7e70c930951f3f70453e4 diff --git a/solr/licenses/jersey-container-jetty-http-3.1.0.jar.sha1 b/solr/licenses/jersey-container-jetty-http-3.1.0.jar.sha1 new file mode 100644 index 00000000000..2280954d855 --- /dev/null +++ b/solr/licenses/jersey-container-jetty-http-3.1.0.jar.sha1 @@ -0,0 +1 @@ +8482b9f3739af45e77350e89a2d746089e57a65f diff --git a/solr/licenses/jetty-alpn-client-10.0.22.jar.sha1 b/solr/licenses/jetty-alpn-client-10.0.22.jar.sha1 deleted file mode 100644 index 2c1cc2437fa..00000000000 --- a/solr/licenses/jetty-alpn-client-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -406aa96e86dc71ab62176ec1ed5212cd1898e38a diff --git a/solr/licenses/jetty-alpn-client-12.0.10.jar.sha1 b/solr/licenses/jetty-alpn-client-12.0.10.jar.sha1 new file mode 100644 index 00000000000..f3223095225 --- /dev/null +++ b/solr/licenses/jetty-alpn-client-12.0.10.jar.sha1 @@ -0,0 +1 @@ +1862da5efd220a4abd54e6a8be12cf709159305e diff --git a/solr/licenses/jetty-alpn-java-client-10.0.22.jar.sha1 b/solr/licenses/jetty-alpn-java-client-10.0.22.jar.sha1 deleted file mode 100644 index 95552987baf..00000000000 --- a/solr/licenses/jetty-alpn-java-client-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4b3abc80849dde116c20d84c834f0289bc61fc35 diff --git a/solr/licenses/jetty-alpn-java-client-12.0.10.jar.sha1 b/solr/licenses/jetty-alpn-java-client-12.0.10.jar.sha1 new file mode 100644 index 00000000000..5bb7e788ff4 --- /dev/null +++ b/solr/licenses/jetty-alpn-java-client-12.0.10.jar.sha1 @@ -0,0 +1 @@ +e8409a5109754d1be753243783aad47959055e16 diff --git a/solr/licenses/jetty-alpn-java-server-10.0.22.jar.sha1 b/solr/licenses/jetty-alpn-java-server-10.0.22.jar.sha1 deleted file mode 100644 index d60ca0fe045..00000000000 --- a/solr/licenses/jetty-alpn-java-server-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2b5bbaae622721f78930009990c3d5a9118e6c3b diff --git a/solr/licenses/jetty-alpn-java-server-12.0.10.jar.sha1 b/solr/licenses/jetty-alpn-java-server-12.0.10.jar.sha1 new file mode 100644 index 00000000000..cdb36b2f6eb --- /dev/null +++ b/solr/licenses/jetty-alpn-java-server-12.0.10.jar.sha1 @@ -0,0 +1 @@ +204c80a8e95d6fd177c0e87ef9e8c3abed6f8917 diff --git a/solr/licenses/jetty-alpn-server-10.0.22.jar.sha1 b/solr/licenses/jetty-alpn-server-10.0.22.jar.sha1 deleted file mode 100644 index a2f2f494568..00000000000 --- a/solr/licenses/jetty-alpn-server-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -533246e6f8ab50186c52b1a9eee75f5259d05c06 diff --git a/solr/licenses/jetty-alpn-server-12.0.10.jar.sha1 b/solr/licenses/jetty-alpn-server-12.0.10.jar.sha1 new file mode 100644 index 00000000000..93623d92a39 --- /dev/null +++ b/solr/licenses/jetty-alpn-server-12.0.10.jar.sha1 @@ -0,0 +1 @@ +cb1988241526d1385f9073a95b5d0c0b0e3753ae diff --git a/solr/licenses/jetty-client-10.0.22.jar.sha1 b/solr/licenses/jetty-client-10.0.22.jar.sha1 deleted file mode 100644 index 54c4ee02d3f..00000000000 --- a/solr/licenses/jetty-client-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7946f242dab0d3e6bd699acb91a3c30bed6cf217 diff --git a/solr/licenses/jetty-client-12.0.10.jar.sha1 b/solr/licenses/jetty-client-12.0.10.jar.sha1 new file mode 100644 index 00000000000..8a7fbcfb40a --- /dev/null +++ b/solr/licenses/jetty-client-12.0.10.jar.sha1 @@ -0,0 +1 @@ +91609e17ba6fee0594b3b27d4f8665e091973df3 diff --git a/solr/licenses/jetty-deploy-10.0.22.jar.sha1 b/solr/licenses/jetty-deploy-10.0.22.jar.sha1 deleted file mode 100644 index b9f52818703..00000000000 --- a/solr/licenses/jetty-deploy-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e761608322a70bd80238572e7f16623e436f73bb diff --git a/solr/licenses/jetty-deploy-12.0.10.jar.sha1 b/solr/licenses/jetty-deploy-12.0.10.jar.sha1 new file mode 100644 index 00000000000..13c7fcf6b94 --- /dev/null +++ b/solr/licenses/jetty-deploy-12.0.10.jar.sha1 @@ -0,0 +1 @@ +5057b91091598a4a561ab4e80cea90549b24f26d diff --git a/solr/licenses/jetty-ee-12.0.10.jar.sha1 b/solr/licenses/jetty-ee-12.0.10.jar.sha1 new file mode 100644 index 00000000000..b999a6f7d2a --- /dev/null +++ b/solr/licenses/jetty-ee-12.0.10.jar.sha1 @@ -0,0 +1 @@ +51d7c54b0d51eeece2918b73d304f95d9d4ed80d diff --git a/solr/licenses/jetty-ee10-servlet-12.0.10.jar.sha1 b/solr/licenses/jetty-ee10-servlet-12.0.10.jar.sha1 new file mode 100644 index 00000000000..b20813c7972 --- /dev/null +++ b/solr/licenses/jetty-ee10-servlet-12.0.10.jar.sha1 @@ -0,0 +1 @@ +a8d087bde78f231084901553bb6829663b4a22f1 diff --git a/solr/licenses/jetty-ee8-nested-12.0.10.jar.sha1 b/solr/licenses/jetty-ee8-nested-12.0.10.jar.sha1 new file mode 100644 index 00000000000..9545e79ea87 --- /dev/null +++ b/solr/licenses/jetty-ee8-nested-12.0.10.jar.sha1 @@ -0,0 +1 @@ +8eb7a9fc496319f09bdf491d0bc63cce8218265c diff --git a/solr/licenses/jetty-ee8-security-12.0.10.jar.sha1 b/solr/licenses/jetty-ee8-security-12.0.10.jar.sha1 new file mode 100644 index 00000000000..c4961463a99 --- /dev/null +++ b/solr/licenses/jetty-ee8-security-12.0.10.jar.sha1 @@ -0,0 +1 @@ +71ea8cb6bf85203e3b37eb8bfe91fd6502dafe4f diff --git a/solr/licenses/jetty-ee8-servlet-12.0.10.jar.sha1 b/solr/licenses/jetty-ee8-servlet-12.0.10.jar.sha1 new file mode 100644 index 00000000000..84652001230 --- /dev/null +++ b/solr/licenses/jetty-ee8-servlet-12.0.10.jar.sha1 @@ -0,0 +1 @@ +d157f0b9948b2726a1348fd7e9bb68b6c6544ee3 diff --git a/solr/licenses/jetty-ee8-servlets-12.0.10.jar.sha1 b/solr/licenses/jetty-ee8-servlets-12.0.10.jar.sha1 new file mode 100644 index 00000000000..955543c20eb --- /dev/null +++ b/solr/licenses/jetty-ee8-servlets-12.0.10.jar.sha1 @@ -0,0 +1 @@ +56a96d9e1bef7a79c74a6861fe0075efe09c02a6 diff --git a/solr/licenses/jetty-ee8-webapp-12.0.10.jar.sha1 b/solr/licenses/jetty-ee8-webapp-12.0.10.jar.sha1 new file mode 100644 index 00000000000..88621a192d7 --- /dev/null +++ b/solr/licenses/jetty-ee8-webapp-12.0.10.jar.sha1 @@ -0,0 +1 @@ +df0067097b0c40fc7710a6d1d386acdb44dae700 diff --git a/solr/licenses/jetty-http-10.0.22.jar.sha1 b/solr/licenses/jetty-http-10.0.22.jar.sha1 deleted file mode 100644 index 892a6f5aa8c..00000000000 --- a/solr/licenses/jetty-http-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5a82b1f99820e14bc31368e8a1d49ee018193e29 diff --git a/solr/licenses/jetty-http-12.0.10.jar.sha1 b/solr/licenses/jetty-http-12.0.10.jar.sha1 new file mode 100644 index 00000000000..18e0ade6615 --- /dev/null +++ b/solr/licenses/jetty-http-12.0.10.jar.sha1 @@ -0,0 +1 @@ +71f438b9cf1ba0b3411c5eddd386eeeeca25168a diff --git a/solr/licenses/jetty-http2-client-12.0.10.jar.sha1 b/solr/licenses/jetty-http2-client-12.0.10.jar.sha1 new file mode 100644 index 00000000000..75d62905a4c --- /dev/null +++ b/solr/licenses/jetty-http2-client-12.0.10.jar.sha1 @@ -0,0 +1 @@ +1049eb6eacfa2c4cbfb0f9fdb4acbab5b53505c8 diff --git a/solr/licenses/jetty-http2-client-transport-12.0.10.jar.sha1 b/solr/licenses/jetty-http2-client-transport-12.0.10.jar.sha1 new file mode 100644 index 00000000000..a9568dd581d --- /dev/null +++ b/solr/licenses/jetty-http2-client-transport-12.0.10.jar.sha1 @@ -0,0 +1 @@ +cfde7b3c18d606785d02c3e8eaf15d325513a909 diff --git a/solr/licenses/jetty-http2-common-12.0.10.jar.sha1 b/solr/licenses/jetty-http2-common-12.0.10.jar.sha1 new file mode 100644 index 00000000000..e701d31f7e0 --- /dev/null +++ b/solr/licenses/jetty-http2-common-12.0.10.jar.sha1 @@ -0,0 +1 @@ +1bab5ae6b953dc3f82bfae25db02e5cb66aeae13 diff --git a/solr/licenses/jetty-http2-hpack-12.0.10.jar.sha1 b/solr/licenses/jetty-http2-hpack-12.0.10.jar.sha1 new file mode 100644 index 00000000000..277643bfb18 --- /dev/null +++ b/solr/licenses/jetty-http2-hpack-12.0.10.jar.sha1 @@ -0,0 +1 @@ +1053ac4f528db28300b50c112ef72dd83511c79b diff --git a/solr/licenses/jetty-http2-server-12.0.10.jar.sha1 b/solr/licenses/jetty-http2-server-12.0.10.jar.sha1 new file mode 100644 index 00000000000..883f870a619 --- /dev/null +++ b/solr/licenses/jetty-http2-server-12.0.10.jar.sha1 @@ -0,0 +1 @@ +1442f4df122cadec95e93c3d0098bad9d6b52c36 diff --git a/solr/licenses/jetty-io-10.0.22.jar.sha1 b/solr/licenses/jetty-io-10.0.22.jar.sha1 deleted file mode 100644 index e4a790b9e8b..00000000000 --- a/solr/licenses/jetty-io-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -706353f75c6a97ae4bd90946bb594c7c56908213 diff --git a/solr/licenses/jetty-io-12.0.10.jar.sha1 b/solr/licenses/jetty-io-12.0.10.jar.sha1 new file mode 100644 index 00000000000..13a05be838e --- /dev/null +++ b/solr/licenses/jetty-io-12.0.10.jar.sha1 @@ -0,0 +1 @@ +4d5ddfc6ad4d6504531861806fade68c7d477f1b diff --git a/solr/licenses/jetty-jmx-10.0.22.jar.sha1 b/solr/licenses/jetty-jmx-10.0.22.jar.sha1 deleted file mode 100644 index fa80fb655fa..00000000000 --- a/solr/licenses/jetty-jmx-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -726cb6525c0f46a13c2caac31004fe44df25fc86 diff --git a/solr/licenses/jetty-jmx-12.0.10.jar.sha1 b/solr/licenses/jetty-jmx-12.0.10.jar.sha1 new file mode 100644 index 00000000000..5234488ec9c --- /dev/null +++ b/solr/licenses/jetty-jmx-12.0.10.jar.sha1 @@ -0,0 +1 @@ +362182acb0fed6962f422520b3d33f5251d44be4 diff --git a/solr/licenses/jetty-rewrite-10.0.22.jar.sha1 b/solr/licenses/jetty-rewrite-10.0.22.jar.sha1 deleted file mode 100644 index 18e392f49d6..00000000000 --- a/solr/licenses/jetty-rewrite-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1910256ece821336b18ffbca47b2fc37042065e2 diff --git a/solr/licenses/jetty-rewrite-12.0.10.jar.sha1 b/solr/licenses/jetty-rewrite-12.0.10.jar.sha1 new file mode 100644 index 00000000000..ae1ad71bf28 --- /dev/null +++ b/solr/licenses/jetty-rewrite-12.0.10.jar.sha1 @@ -0,0 +1 @@ +030d552dfd428ffce4efb924b034f672f46590d9 diff --git a/solr/licenses/jetty-security-10.0.22.jar.sha1 b/solr/licenses/jetty-security-10.0.22.jar.sha1 deleted file mode 100644 index d55aeacb25e..00000000000 --- a/solr/licenses/jetty-security-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6987e8708990efdfe1878f6427fdd293fc0a8e9f diff --git a/solr/licenses/jetty-security-12.0.10.jar.sha1 b/solr/licenses/jetty-security-12.0.10.jar.sha1 new file mode 100644 index 00000000000..a3a1c562a3c --- /dev/null +++ b/solr/licenses/jetty-security-12.0.10.jar.sha1 @@ -0,0 +1 @@ +a7bd8056fa84439411f60fedd8a94b1983880cf9 diff --git a/solr/licenses/jetty-server-10.0.22.jar.sha1 b/solr/licenses/jetty-server-10.0.22.jar.sha1 deleted file mode 100644 index 7da9c89cba5..00000000000 --- a/solr/licenses/jetty-server-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b4447ea127dff476960ab28c8f15aad2f70defee diff --git a/solr/licenses/jetty-server-12.0.10.jar.sha1 b/solr/licenses/jetty-server-12.0.10.jar.sha1 new file mode 100644 index 00000000000..0df46f6869b --- /dev/null +++ b/solr/licenses/jetty-server-12.0.10.jar.sha1 @@ -0,0 +1 @@ +0dcdef1c9ead5040e6b637512ab1794191058a22 diff --git a/solr/licenses/jetty-servlet-10.0.22.jar.sha1 b/solr/licenses/jetty-servlet-10.0.22.jar.sha1 deleted file mode 100644 index f5058977c0a..00000000000 --- a/solr/licenses/jetty-servlet-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c794f52275e85432baf148b9c59bf3fa2c1f1043 diff --git a/solr/licenses/jetty-servlets-10.0.22.jar.sha1 b/solr/licenses/jetty-servlets-10.0.22.jar.sha1 deleted file mode 100644 index 89e7b1ee5b5..00000000000 --- a/solr/licenses/jetty-servlets-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b90ba6757c3c56d3988b5c8d45087d181c1c5be0 diff --git a/solr/licenses/jetty-session-12.0.10.jar.sha1 b/solr/licenses/jetty-session-12.0.10.jar.sha1 new file mode 100644 index 00000000000..24d2cf3c7ec --- /dev/null +++ b/solr/licenses/jetty-session-12.0.10.jar.sha1 @@ -0,0 +1 @@ +96dd580a79d938b532e8cff47475efbcaa80ea58 diff --git a/solr/licenses/jetty-start-10.0.22-shaded.jar.sha1 b/solr/licenses/jetty-start-10.0.22-shaded.jar.sha1 deleted file mode 100644 index 6a2d564048d..00000000000 --- a/solr/licenses/jetty-start-10.0.22-shaded.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6389146cd3e762d33a567fb721bf7060a07f03d8 diff --git a/solr/licenses/jetty-start-12.0.10-shaded.jar.sha1 b/solr/licenses/jetty-start-12.0.10-shaded.jar.sha1 new file mode 100644 index 00000000000..0f6209e3fcf --- /dev/null +++ b/solr/licenses/jetty-start-12.0.10-shaded.jar.sha1 @@ -0,0 +1 @@ +e893e63f80685d3e64660067a8285efb839c556f diff --git a/solr/licenses/jetty-util-10.0.22.jar.sha1 b/solr/licenses/jetty-util-10.0.22.jar.sha1 deleted file mode 100644 index 5b5d826e6db..00000000000 --- a/solr/licenses/jetty-util-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9add990f8bfe742ff807944113beb5990f14c1f0 diff --git a/solr/licenses/jetty-util-12.0.10.jar.sha1 b/solr/licenses/jetty-util-12.0.10.jar.sha1 new file mode 100644 index 00000000000..f8a40714ffd --- /dev/null +++ b/solr/licenses/jetty-util-12.0.10.jar.sha1 @@ -0,0 +1 @@ +ec7c95b5a289560f4a7be57170f4fdbedde72b92 diff --git a/solr/licenses/jetty-webapp-10.0.22.jar.sha1 b/solr/licenses/jetty-webapp-10.0.22.jar.sha1 deleted file mode 100644 index 6e035721282..00000000000 --- a/solr/licenses/jetty-webapp-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a2517ec8dd2d0c623192094c379d20e5443b80b2 diff --git a/solr/licenses/jetty-xml-10.0.22.jar.sha1 b/solr/licenses/jetty-xml-10.0.22.jar.sha1 deleted file mode 100644 index 813eb0bf0f9..00000000000 --- a/solr/licenses/jetty-xml-10.0.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -68d31a946fc73f8320766629f3a52cceb4d88ceb diff --git a/solr/licenses/jetty-xml-12.0.10.jar.sha1 b/solr/licenses/jetty-xml-12.0.10.jar.sha1 new file mode 100644 index 00000000000..3076a3cadc8 --- /dev/null +++ b/solr/licenses/jetty-xml-12.0.10.jar.sha1 @@ -0,0 +1 @@ +fe893478d62893e2a50b24fe45d9ec751c399ecc diff --git a/solr/licenses/metrics-jetty10-4.2.26.jar.sha1 b/solr/licenses/metrics-jetty10-4.2.26.jar.sha1 deleted file mode 100644 index 1f10290709f..00000000000 --- a/solr/licenses/metrics-jetty10-4.2.26.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e98955ccd143d9000a4796ea9f1cfb996ef730f3 diff --git a/solr/licenses/metrics-jetty12-4.2.26.jar.sha1 b/solr/licenses/metrics-jetty12-4.2.26.jar.sha1 new file mode 100644 index 00000000000..69874b4fe3b --- /dev/null +++ b/solr/licenses/metrics-jetty12-4.2.26.jar.sha1 @@ -0,0 +1 @@ +7d4bdf5d9915b45c8202aac4861956932956ce26 diff --git a/solr/licenses/metrics-jetty12-ee10-4.2.26.jar.sha1 b/solr/licenses/metrics-jetty12-ee10-4.2.26.jar.sha1 new file mode 100644 index 00000000000..58855d2494a --- /dev/null +++ b/solr/licenses/metrics-jetty12-ee10-4.2.26.jar.sha1 @@ -0,0 +1 @@ +ac14c220fd14d23b6041b66c82fedb35b923506e diff --git a/solr/modules/hadoop-auth/build.gradle b/solr/modules/hadoop-auth/build.gradle index ab69cb46907..c950931d331 100644 --- a/solr/modules/hadoop-auth/build.gradle +++ b/solr/modules/hadoop-auth/build.gradle @@ -45,6 +45,7 @@ dependencies { implementation libs.apache.httpcomponents.httpcore implementation libs.eclipse.jetty.client + implementation libs.eclipse.jetty.http // ZooKeeper & Curator implementation(libs.apache.zookeeper.zookeeper, { @@ -78,7 +79,6 @@ dependencies { testImplementation libs.carrotsearch.randomizedtesting.runner testImplementation libs.junit.junit testImplementation libs.hamcrest.hamcrest - testImplementation(libs.mockito.core, { exclude group: "net.bytebuddy", module: "byte-buddy-agent" }) diff --git a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/ConfigurableInternodeAuthHadoopPlugin.java b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/ConfigurableInternodeAuthHadoopPlugin.java index 35f59105012..69e4d5fb992 100644 --- a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/ConfigurableInternodeAuthHadoopPlugin.java +++ b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/ConfigurableInternodeAuthHadoopPlugin.java @@ -34,7 +34,7 @@ import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.security.HttpClientBuilderPlugin; import org.apache.solr.servlet.SolrDispatchFilter; -import org.eclipse.jetty.client.api.Request; +import org.eclipse.jetty.client.Request; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/KerberosPlugin.java b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/KerberosPlugin.java index 66b9b90dee2..cfb4465df96 100644 --- a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/KerberosPlugin.java +++ b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/KerberosPlugin.java @@ -50,7 +50,7 @@ import org.apache.solr.security.AuthenticationPlugin; import org.apache.solr.security.HttpClientBuilderPlugin; import org.apache.solr.servlet.SolrDispatchFilter; -import org.eclipse.jetty.client.api.Request; +import org.eclipse.jetty.client.Request; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -293,7 +293,7 @@ public boolean interceptInternodeRequest(HttpRequest httpRequest, HttpContext ht @Override protected boolean interceptInternodeRequest(Request request) { - return intercept(request::header); + return intercept((name, val) -> request.headers(httpFields -> httpFields.add(name, val))); } private boolean intercept(BiConsumer header) { diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/client/solrj/impl/Krb5HttpClientUtils.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/client/solrj/impl/Krb5HttpClientUtils.java index 8f78c5035fb..a3d7b5e1e50 100644 --- a/solr/modules/hadoop-auth/src/test/org/apache/solr/client/solrj/impl/Krb5HttpClientUtils.java +++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/client/solrj/impl/Krb5HttpClientUtils.java @@ -21,9 +21,9 @@ import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.Configuration; import org.apache.solr.common.util.EnvUtils; -import org.eclipse.jetty.client.HttpAuthenticationStore; +import org.eclipse.jetty.client.SPNEGOAuthentication; import org.eclipse.jetty.client.WWWAuthenticationProtocolHandler; -import org.eclipse.jetty.client.util.SPNEGOAuthentication; +import org.eclipse.jetty.client.internal.HttpAuthenticationStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.java index 58212f8b8ba..80b87a187bd 100644 --- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.java +++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.java @@ -54,7 +54,7 @@ import org.apache.solr.common.util.ExecutorUtil; import org.apache.solr.core.CoreContainer; import org.apache.solr.request.SolrRequestInfo; -import org.eclipse.jetty.client.api.Request; +import org.eclipse.jetty.client.Request; /** * AuthenticationHandler that supports delegation tokens and simple authentication via the "user" @@ -156,7 +156,11 @@ public void setup(Http2SolrClient client) { new HttpListenerFactory.RequestResponseListener() { @Override public void onQueued(Request request) { - getPrincipal().ifPresent(usr -> request.header(INTERNAL_REQUEST_HEADER, usr)); + getPrincipal() + .ifPresent( + usr -> + request.headers( + httpFields -> httpFields.add(INTERNAL_REQUEST_HEADER, usr))); } }; client.addListenerFactory(() -> listener); diff --git a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java index bb64f458f4e..7cdd84fadb4 100644 --- a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java +++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java @@ -65,7 +65,7 @@ import org.apache.solr.security.jwt.api.ModifyJWTAuthPluginConfigAPI; import org.apache.solr.servlet.LoadAdminUiServlet; import org.apache.solr.util.CryptoKeys; -import org.eclipse.jetty.client.api.Request; +import org.eclipse.jetty.client.Request; import org.jose4j.jwa.AlgorithmConstraints; import org.jose4j.jwk.HttpsJwks; import org.jose4j.jwt.JwtClaims; diff --git a/solr/server/build.gradle b/solr/server/build.gradle index a7055de6539..870d582e985 100644 --- a/solr/server/build.gradle +++ b/solr/server/build.gradle @@ -75,6 +75,7 @@ dependencies { libExt(libs.dropwizard.metrics.core, { exclude group: "com.rabbitmq", module: "amqp-client" + }) libExt(libs.dropwizard.metrics.graphite, { exclude group: "com.rabbitmq", module: "amqp-client" @@ -83,6 +84,7 @@ dependencies { exclude group: "org.eclipse.jetty", module: "*" exclude group: "org.eclipse.jetty.http2", module: "*" exclude group: "org.eclipse.jetty.toolchain", module: "*" + exclude group: 'jakarta.servlet', module: 'jakarta.servlet-api' }) libExt libs.dropwizard.metrics.jvm libExt libs.dropwizard.metrics.jmx diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle index 2e6636519ff..2d092cf35fc 100644 --- a/solr/solrj/build.gradle +++ b/solr/solrj/build.gradle @@ -81,6 +81,7 @@ dependencies { testRuntimeOnly(libs.eclipse.jetty.alpnjavaserver, { exclude group: "org.eclipse.jetty.alpn", module: "alpn-api" }) + testImplementation libs.eclipse.jetty.session testImplementation(libs.mockito.core, { exclude group: "net.bytebuddy", module: "byte-buddy-agent" }) diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/AuthenticationStoreHolder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/AuthenticationStoreHolder.java index 1d9452f9e85..85b62ab64a4 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/AuthenticationStoreHolder.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/AuthenticationStoreHolder.java @@ -18,9 +18,9 @@ package org.apache.solr.client.solrj.impl; import java.net.URI; -import org.eclipse.jetty.client.HttpAuthenticationStore; -import org.eclipse.jetty.client.api.Authentication; -import org.eclipse.jetty.client.api.AuthenticationStore; +import org.eclipse.jetty.client.Authentication; +import org.eclipse.jetty.client.AuthenticationStore; +import org.eclipse.jetty.client.internal.HttpAuthenticationStore; public class AuthenticationStoreHolder implements AuthenticationStore { diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java index 7b44264f995..afd8ca66ee5 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java @@ -41,8 +41,8 @@ import org.apache.solr.common.util.ExecutorUtil; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SolrNamedThreadFactory; -import org.eclipse.jetty.client.api.Response; -import org.eclipse.jetty.client.util.InputStreamResponseListener; +import org.eclipse.jetty.client.InputStreamResponseListener; +import org.eclipse.jetty.client.Response; import org.eclipse.jetty.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java index e3f974e41e3..5f1436572f0 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java @@ -23,7 +23,6 @@ import java.lang.invoke.MethodHandles; import java.lang.reflect.InvocationTargetException; import java.net.ConnectException; -import java.net.CookieStore; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -58,36 +57,37 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.ObjectReleaseTracker; import org.apache.solr.common.util.SolrNamedThreadFactory; +import org.eclipse.jetty.client.AuthenticationStore; +import org.eclipse.jetty.client.FormRequestContent; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClientTransport; import org.eclipse.jetty.client.HttpProxy; +import org.eclipse.jetty.client.InputStreamRequestContent; +import org.eclipse.jetty.client.InputStreamResponseListener; +import org.eclipse.jetty.client.MultiPartRequestContent; import org.eclipse.jetty.client.Origin.Address; import org.eclipse.jetty.client.Origin.Protocol; +import org.eclipse.jetty.client.OutputStreamRequestContent; import org.eclipse.jetty.client.ProtocolHandlers; import org.eclipse.jetty.client.ProxyConfiguration; +import org.eclipse.jetty.client.Request; +import org.eclipse.jetty.client.Response; +import org.eclipse.jetty.client.Result; import org.eclipse.jetty.client.Socks4Proxy; -import org.eclipse.jetty.client.api.AuthenticationStore; -import org.eclipse.jetty.client.api.Request; -import org.eclipse.jetty.client.api.Response; -import org.eclipse.jetty.client.api.Result; -import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP; -import org.eclipse.jetty.client.util.FormRequestContent; -import org.eclipse.jetty.client.util.InputStreamRequestContent; -import org.eclipse.jetty.client.util.InputStreamResponseListener; -import org.eclipse.jetty.client.util.MultiPartRequestContent; -import org.eclipse.jetty.client.util.OutputStreamRequestContent; -import org.eclipse.jetty.client.util.StringRequestContent; +import org.eclipse.jetty.client.StringRequestContent; +import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP; +import org.eclipse.jetty.http.HttpCookieStore; import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.MimeTypes; +import org.eclipse.jetty.http.MultiPart; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.Fields; -import org.eclipse.jetty.util.HttpCookieStore; import org.eclipse.jetty.util.ssl.KeyStoreScanner; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.slf4j.Logger; @@ -255,7 +255,7 @@ private HttpClient createHttpClient(Builder builder) { httpClient.setIdleTimeout(idleTimeoutMillis); if (builder.cookieStore != null) { - httpClient.setCookieStore(builder.cookieStore); + httpClient.setHttpCookieStore(builder.cookieStore); } this.authenticationStore = new AuthenticationStoreHolder(); @@ -757,7 +757,8 @@ private Request fillContentStream( String[] vals = wparams.getParams(key); if (vals != null) { for (String val : vals) { - content.addFieldPart(key, new StringRequestContent(val), null); + content.addPart( + new MultiPart.ContentSourcePart(key, null, null, new StringRequestContent(val))); } } } @@ -773,11 +774,12 @@ private Request fillContentStream( } HttpFields.Mutable fields = HttpFields.build(1); fields.add(HttpHeader.CONTENT_TYPE, contentType); - content.addFilePart( - name, - contentStream.getName(), - new InputStreamRequestContent(contentStream.getStream()), - fields); + content.addPart( + new MultiPart.ContentSourcePart( + name, + contentStream.getName(), + fields, + new InputStreamRequestContent(contentStream.getStream()))); } } req.body(content); @@ -904,7 +906,7 @@ public static class Builder private HttpClient httpClient; - protected CookieStore cookieStore; + protected HttpCookieStore cookieStore; private SSLConfig sslConfig; @@ -1007,7 +1009,7 @@ public Http2SolrClient.Builder requestTimeout(int requestTimeout) { return this; } - private CookieStore getDefaultCookieStore() { + private HttpCookieStore getDefaultCookieStore() { if (Boolean.getBoolean("solr.http.disableCookies")) { return new HttpCookieStore.Empty(); } @@ -1129,7 +1131,7 @@ public Builder withHttpClient(Http2SolrClient http2SolrClient) { * @param cookieStore The CookieStore to set. {@code null} will set the default. * @return this Builder */ - public Builder withCookieStore(CookieStore cookieStore) { + public Builder withCookieStore(HttpCookieStore cookieStore) { this.cookieStore = cookieStore; return this; } diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java index e4f47fd9dbf..cf42a0107f0 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java @@ -17,9 +17,9 @@ package org.apache.solr.client.solrj.impl; -import org.eclipse.jetty.client.api.Request; -import org.eclipse.jetty.client.api.Response; -import org.eclipse.jetty.client.api.Result; +import org.eclipse.jetty.client.Request; +import org.eclipse.jetty.client.Response; +import org.eclipse.jetty.client.Result; public interface HttpListenerFactory { abstract class RequestResponseListener diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java index 8b47d45d2f0..2b8e7d5f12a 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java @@ -41,9 +41,9 @@ import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.impl.auth.SPNegoSchemeFactory; import org.apache.http.impl.client.BasicCredentialsProvider; -import org.eclipse.jetty.client.HttpAuthenticationStore; +import org.eclipse.jetty.client.SPNEGOAuthentication; import org.eclipse.jetty.client.WWWAuthenticationProtocolHandler; -import org.eclipse.jetty.client.util.SPNEGOAuthentication; +import org.eclipse.jetty.client.internal.HttpAuthenticationStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactory.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactory.java index 0d1231baa74..1ba61fa9137 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactory.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactory.java @@ -35,9 +35,9 @@ import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.StrUtils; -import org.eclipse.jetty.client.HttpAuthenticationStore; import org.eclipse.jetty.client.ProxyAuthenticationProtocolHandler; import org.eclipse.jetty.client.WWWAuthenticationProtocolHandler; +import org.eclipse.jetty.client.internal.HttpAuthenticationStore; /** * HttpClientConfigurer implementation providing support for preemptive Http Basic authentication diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java index 3b15b841818..002a34e53ee 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java @@ -21,9 +21,9 @@ import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.Locale; -import org.eclipse.jetty.client.api.Authentication; -import org.eclipse.jetty.client.api.ContentResponse; -import org.eclipse.jetty.client.api.Request; +import org.eclipse.jetty.client.Authentication; +import org.eclipse.jetty.client.ContentResponse; +import org.eclipse.jetty.client.Request; import org.eclipse.jetty.util.Attributes; /** BasicAuthentication that does not care about uri and realm */ @@ -61,7 +61,7 @@ public URI getURI() { @Override public void apply(Request request) { - request.header(headerInfo.getHeader(), value); + request.headers(httpFields -> httpFields.add(headerInfo.getHeader(), value)); } }; } diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java b/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java index ad308589d34..ccc5f2a278f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java @@ -17,11 +17,11 @@ package org.apache.solr.client.solrj; import java.lang.invoke.MethodHandles; +import org.eclipse.jetty.ee8.webapp.WebAppContext; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.webapp.WebAppContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java index 024b79b5c1d..2a6e8930daa 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java @@ -30,12 +30,13 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.impl.HttpClientUtil; import org.apache.solr.util.ExternalPaths; +import org.eclipse.jetty.ee8.webapp.WebAppContext; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.session.DefaultSessionIdManager; -import org.eclipse.jetty.webapp.WebAppContext; +import org.eclipse.jetty.session.DefaultSessionIdManager; +import org.eclipse.jetty.session.SessionHandler; /** * @since solr 1.3 @@ -60,7 +61,8 @@ public void setUp() throws Exception { server = new Server(port); // insecure: only use for tests!!!! - server.setSessionIdManager( + var sessionHandler = new SessionHandler(); + sessionHandler.setSessionIdManager( new DefaultSessionIdManager(server, new Random(random().nextLong()))); new WebAppContext(server, path, "/solr"); diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java index 30299f0b572..27ef37c176c 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java @@ -70,7 +70,7 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SuppressForbidden; import org.apache.solr.embedded.JettyConfig; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java index 6d745a6058f..cd3684a8156 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java @@ -29,8 +29,8 @@ import org.apache.solr.common.util.ExecutorUtil; import org.apache.solr.common.util.SolrNamedThreadFactory; import org.apache.solr.embedded.JettyConfig; -import org.eclipse.jetty.client.api.Response; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.client.Response; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.BeforeClass; import org.junit.Test; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java index cc49c05994e..f822b4c4c99 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java @@ -41,7 +41,7 @@ import org.apache.solr.common.util.ExecutorUtil; import org.apache.solr.common.util.SolrNamedThreadFactory; import org.apache.solr.embedded.JettyConfig; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java index d1074b99531..1a38d11bbf3 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java @@ -25,9 +25,9 @@ import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.embedded.JettyConfig; import org.apache.solr.util.LogLevel; -import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP; +import org.eclipse.jetty.ee8.servlet.ServletHolder; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; @LogLevel("org.eclipse.jetty.client=DEBUG;org.eclipse.jetty.util=DEBUG") @SolrTestCaseJ4.SuppressSSL diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java index 1c8525b74b6..d8087113c7b 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java @@ -51,7 +51,7 @@ import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.embedded.JettyConfig; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.BeforeClass; public abstract class HttpSolrClientTestBase extends SolrJettyTestBase { diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java index dd89fb97cbb..8e8fdba5acb 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java @@ -44,7 +44,7 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.util.RestTestBase; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle index 0dfa58b829b..6d92afd74e4 100644 --- a/solr/test-framework/build.gradle +++ b/solr/test-framework/build.gradle @@ -65,7 +65,9 @@ dependencies { implementation libs.apache.log4j.api implementation libs.apache.log4j.core implementation libs.dropwizard.metrics.core - implementation libs.dropwizard.metrics.jetty10 + implementation (libs.dropwizard.metrics.jetty10){ + exclude group: 'jakarta.servlet', module: 'jakarta.servlet-api' + } implementation libs.commonscli.commonscli permitUnusedDeclared libs.commonscli.commonscli implementation libs.apache.httpcomponents.httpclient @@ -74,6 +76,8 @@ dependencies { implementation libs.eclipse.jetty.toolchain.servletapi implementation libs.eclipse.jetty.server + implementation libs.eclipse.jetty.ee8.nested + implementation libs.eclipse.jetty.session api libs.eclipse.jetty.servlet implementation libs.eclipse.jetty.util implementation libs.eclipse.jetty.alpnserver diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java index f77f9dac942..fc9d8b19e31 100644 --- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java +++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java @@ -65,7 +65,7 @@ import org.apache.solr.common.util.SolrNamedThreadFactory; import org.apache.solr.embedded.JettyConfig; import org.apache.solr.embedded.JettySolrRunner; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java index 505e276e170..6e1374e5d15 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java @@ -27,7 +27,7 @@ import org.apache.solr.embedded.JettyConfig; import org.apache.solr.embedded.JettySolrRunner; import org.apache.solr.util.SolrJettyTestRule; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.ClassRule; @Deprecated // just use SolrJettyTestRule diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java index c600c7e4ffa..f49610d4544 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java @@ -19,6 +19,7 @@ import static org.apache.solr.core.ConfigSetProperties.DEFAULT_FILENAME; import com.codahale.metrics.MetricRegistry; +import io.dropwizard.metrics.jetty12.ee10.InstrumentedEE10Handler; import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -85,8 +86,8 @@ import org.apache.solr.util.tracing.SimplePropagator; import org.apache.solr.util.tracing.TraceUtils; import org.apache.zookeeper.KeeperException; -import org.eclipse.jetty.server.handler.HandlerWrapper; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; +import org.eclipse.jetty.server.Handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -993,10 +994,9 @@ public JettySolrRunnerWithMetrics(String solrHome, Properties nodeProps, JettyCo private volatile MetricRegistry metricRegistry; @Override - protected HandlerWrapper injectJettyHandlers(HandlerWrapper chain) { + protected Handler.Wrapper injectJettyHandlers(Handler.Wrapper chain) { metricRegistry = new MetricRegistry(); - io.dropwizard.metrics.jetty10.InstrumentedHandler metrics = - new io.dropwizard.metrics.jetty10.InstrumentedHandler(metricRegistry); + InstrumentedEE10Handler metrics = new InstrumentedEE10Handler(metricRegistry); metrics.setHandler(chain); return metrics; } diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java index 190a0d38d83..c839e181bab 100644 --- a/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java +++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java @@ -22,7 +22,7 @@ import javax.servlet.Filter; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.embedded.SSLConfig; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; public class JettyConfig { diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java index 9c033827241..55d934f1e59 100644 --- a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java +++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java @@ -74,25 +74,26 @@ import org.apache.solr.util.TimeOut; import org.apache.solr.util.configuration.SSLConfigurationsFactory; import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory; +import org.eclipse.jetty.ee8.nested.SessionHandler; +import org.eclipse.jetty.ee8.servlet.FilterHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.Source; import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; import org.eclipse.jetty.rewrite.handler.RewriteHandler; import org.eclipse.jetty.rewrite.handler.RewritePatternRule; import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.server.handler.gzip.GzipHandler; -import org.eclipse.jetty.server.session.DefaultSessionIdManager; -import org.eclipse.jetty.servlet.FilterHolder; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.servlet.Source; +import org.eclipse.jetty.session.DefaultSessionIdManager; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ReservedThreadExecutor; @@ -350,7 +351,7 @@ private void init(int port) { connector.setIdleTimeout(THREAD_POOL_MAX_IDLE_TIME_MS); server.setConnectors(new Connector[] {connector}); - server.setSessionIdManager(new DefaultSessionIdManager(server, new Random())); + // server.setSessionIdManager(new DefaultSessionIdManager(server, new Random())); } else { HttpConfiguration configuration = new HttpConfiguration(); ServerConnector connector = @@ -365,13 +366,17 @@ private void init(int port) { server.setConnectors(new Connector[] {connector}); } - HandlerWrapper chain; + Handler.Wrapper chain = new Handler.Wrapper(); { // Initialize the servlets final ServletContextHandler root = new ServletContextHandler(server, "/solr", ServletContextHandler.SESSIONS); root.setResourceBase("."); - + if (System.getProperty("jetty.testMode") != null) { + SessionHandler sessionHandler = new SessionHandler(); + sessionHandler.setSessionIdManager(new DefaultSessionIdManager(server, new Random())); + root.setSessionHandler(sessionHandler); + } root.addEventListener( // Install CCP first. Subclass CCP to do some pre-initialization new CoreContainerProvider() { @@ -414,7 +419,7 @@ public void contextInitialized(ServletContextEvent event) { // Default servlet as a fall-through root.addServlet(Servlet404.class, "/"); - chain = root; + chain.setHandler(root); } chain = injectJettyHandlers(chain); @@ -422,8 +427,8 @@ public void contextInitialized(ServletContextEvent event) { if (config.enableV2) { RewriteHandler rwh = new RewriteHandler(); rwh.setHandler(chain); - rwh.setRewriteRequestURI(true); - rwh.setRewritePathInfo(false); + // rwh.setRewriteRequestURI(true); + // rwh.setRewritePathInfo(false); rwh.setOriginalPathAttribute("requestedPath"); rwh.addRule(new RewritePatternRule("/api/*", "/solr/____v2")); chain = rwh; @@ -442,7 +447,7 @@ public void contextInitialized(ServletContextEvent event) { * descendants may inject own handler chaining it to the given root and then returning that own * one */ - protected HandlerWrapper injectJettyHandlers(HandlerWrapper chain) { + protected Handler.Wrapper injectJettyHandlers(Handler.Wrapper chain) { return chain; } diff --git a/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java b/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java index ce066c4e1eb..25b168c1c8d 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java @@ -26,7 +26,7 @@ import org.apache.solr.common.params.MultiMapSolrParams; import org.apache.solr.common.util.StrUtils; import org.apache.solr.servlet.SolrRequestParsers; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.AfterClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java index 4b0c7c47529..a77a2ff5bdb 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java +++ b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java @@ -43,6 +43,7 @@ import org.apache.solr.client.solrj.impl.HttpClientUtil; import org.apache.solr.client.solrj.impl.HttpClientUtil.SocketFactoryRegistryProvider; import org.eclipse.jetty.util.resource.Resource; +import org.eclipse.jetty.util.resource.ResourceFactory; import org.eclipse.jetty.util.security.CertificateUtils; import org.eclipse.jetty.util.ssl.SslContextFactory; @@ -103,6 +104,7 @@ public SSLTestConfig(boolean useSsl, boolean clientAuth) { * Certificate (and which testing Cert should be used) * @see HttpClientUtil#SYS_PROP_CHECK_PEER_NAME */ + @SuppressWarnings("removal") public SSLTestConfig(boolean useSsl, boolean clientAuth, boolean checkPeerName) { this.useSsl = useSsl; this.clientAuth = clientAuth; @@ -114,7 +116,7 @@ public SSLTestConfig(boolean useSsl, boolean clientAuth, boolean checkPeerName) final String resourceName = checkPeerName ? TEST_KEYSTORE_LOCALHOST_RESOURCE : TEST_KEYSTORE_BOGUSHOST_RESOURCE; - trustStore = keyStore = Resource.newClassPathResource(resourceName); + trustStore = keyStore = ResourceFactory.root().newSystemResource(resourceName); if (null == keyStore || !keyStore.exists()) { throw new IllegalStateException( "Unable to locate keystore resource file in classpath: " + resourceName); diff --git a/versions.lock b/versions.lock index b2bec0363ed..c31a5af4ede 100644 --- a/versions.lock +++ b/versions.lock @@ -131,7 +131,8 @@ "io.dropwizard.metrics:metrics-core:4.2.26" : "87cd582a,refs=121", "io.dropwizard.metrics:metrics-graphite:4.2.26" : "27f62655,refs=81", "io.dropwizard.metrics:metrics-healthchecks:4.2.26" : "0769b123,refs=5", - "io.dropwizard.metrics:metrics-jetty10:4.2.26" : "1f5bde05,refs=47", + "io.dropwizard.metrics:metrics-jetty12:4.2.26" : "1f5bde05,refs=47", + "io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26" : "1f5bde05,refs=47", "io.dropwizard.metrics:metrics-jmx:4.2.26" : "27f62655,refs=81", "io.dropwizard.metrics:metrics-json:4.2.26" : "0769b123,refs=5", "io.dropwizard.metrics:metrics-jvm:4.2.26" : "dc28f153,refs=83", @@ -361,29 +362,34 @@ "org.codehaus.woodstox:stax2-api:4.2.2" : "5b11e899,refs=81", "org.codelibs:jhighlight:1.1.0" : "50a667d1,refs=5", "org.conscrypt:conscrypt-openjdk-uber:2.5.2" : "784a94ea,refs=5", - "org.eclipse.jetty.http2:http2-client:10.0.22" : "1b72eeae,refs=128", - "org.eclipse.jetty.http2:http2-common:10.0.22" : "84afbb60,refs=130", - "org.eclipse.jetty.http2:http2-hpack:10.0.22" : "84afbb60,refs=130", - "org.eclipse.jetty.http2:http2-http-client-transport:10.0.22" : "f9ff6c21,refs=84", - "org.eclipse.jetty.http2:http2-server:10.0.22" : "5967e690,refs=32", + "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.10" : "1f5bde05,refs=47", + "org.eclipse.jetty.ee8:jetty-ee8-nested:12.0.10" : "0e779887,refs=59", + "org.eclipse.jetty.ee8:jetty-ee8-security:12.0.10" : "0e779887,refs=59", + "org.eclipse.jetty.ee8:jetty-ee8-servlet:12.0.10" : "0e779887,refs=59", + "org.eclipse.jetty.ee8:jetty-ee8-servlets:12.0.10" : "24396a00,refs=4", + "org.eclipse.jetty.ee8:jetty-ee8-webapp:12.0.10" : "062c26b4,refs=7", + "org.eclipse.jetty.http2:jetty-http2-client:12.0.10" : "1b72eeae,refs=128", + "org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.10" : "f9ff6c21,refs=84", + "org.eclipse.jetty.http2:jetty-http2-common:12.0.10" : "84afbb60,refs=130", + "org.eclipse.jetty.http2:jetty-http2-hpack:12.0.10" : "84afbb60,refs=130", + "org.eclipse.jetty.http2:jetty-http2-server:12.0.10" : "5967e690,refs=32", "org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6" : "5e82f1c0,refs=109", - "org.eclipse.jetty:jetty-alpn-client:10.0.22" : "1b72eeae,refs=128", - "org.eclipse.jetty:jetty-alpn-java-client:10.0.22" : "f9ff6c21,refs=84", - "org.eclipse.jetty:jetty-alpn-java-server:10.0.22" : "1069c1cc,refs=30", - "org.eclipse.jetty:jetty-alpn-server:10.0.22" : "5967e690,refs=32", - "org.eclipse.jetty:jetty-client:10.0.22" : "7f2dd9d5,refs=90", - "org.eclipse.jetty:jetty-deploy:10.0.22" : "24396a00,refs=4", - "org.eclipse.jetty:jetty-http:10.0.22" : "84afbb60,refs=130", - "org.eclipse.jetty:jetty-io:10.0.22" : "84afbb60,refs=130", - "org.eclipse.jetty:jetty-jmx:10.0.22" : "24396a00,refs=4", - "org.eclipse.jetty:jetty-rewrite:10.0.22" : "5967e690,refs=32", - "org.eclipse.jetty:jetty-security:10.0.22" : "0e779887,refs=59", - "org.eclipse.jetty:jetty-server:10.0.22" : "d008b72a,refs=107", - "org.eclipse.jetty:jetty-servlet:10.0.22" : "0e779887,refs=59", - "org.eclipse.jetty:jetty-servlets:10.0.22" : "24396a00,refs=4", - "org.eclipse.jetty:jetty-util:10.0.22" : "84afbb60,refs=130", - "org.eclipse.jetty:jetty-webapp:10.0.22" : "062c26b4,refs=7", - "org.eclipse.jetty:jetty-xml:10.0.22" : "062c26b4,refs=7", + "org.eclipse.jetty:jetty-alpn-client:12.0.10" : "1b72eeae,refs=128", + "org.eclipse.jetty:jetty-alpn-java-client:12.0.10" : "f9ff6c21,refs=84", + "org.eclipse.jetty:jetty-alpn-java-server:12.0.10" : "1069c1cc,refs=30", + "org.eclipse.jetty:jetty-alpn-server:12.0.10" : "5967e690,refs=32", + "org.eclipse.jetty:jetty-client:12.0.10" : "7f2dd9d5,refs=90", + "org.eclipse.jetty:jetty-deploy:12.0.10" : "24396a00,refs=4", + "org.eclipse.jetty:jetty-ee:12.0.10" : "062c26b4,refs=7", + "org.eclipse.jetty:jetty-http:12.0.10" : "84afbb60,refs=130", + "org.eclipse.jetty:jetty-io:12.0.10" : "84afbb60,refs=130", + "org.eclipse.jetty:jetty-jmx:12.0.10" : "24396a00,refs=4", + "org.eclipse.jetty:jetty-rewrite:12.0.10" : "5967e690,refs=32", + "org.eclipse.jetty:jetty-security:12.0.10" : "0e779887,refs=59", + "org.eclipse.jetty:jetty-server:12.0.10" : "d008b72a,refs=107", + "org.eclipse.jetty:jetty-session:12.0.10" : "0e779887,refs=59", + "org.eclipse.jetty:jetty-util:12.0.10" : "84afbb60,refs=130", + "org.eclipse.jetty:jetty-xml:12.0.10" : "062c26b4,refs=7", "org.freemarker:freemarker:2.3.32" : "c77c5ec7,refs=1", "org.gagravarr:vorbis-java-core:0.8" : "50a667d1,refs=5", "org.gagravarr:vorbis-java-tika:0.8" : "50a667d1,refs=5", @@ -394,7 +400,7 @@ "org.glassfish.hk2:osgi-resource-locator:1.0.3" : "ad8f08d7,refs=79", "org.glassfish.jaxb:jaxb-runtime:2.3.8" : "debe9836,refs=7", "org.glassfish.jaxb:txw2:2.3.8" : "debe9836,refs=7", - "org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1" : "ad8f08d7,refs=79", + "org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.0" : "ad8f08d7,refs=79", "org.glassfish.jersey.core:jersey-client:3.1.9" : "ad8f08d7,refs=79", "org.glassfish.jersey.core:jersey-common:3.1.9" : "ad8f08d7,refs=79", "org.glassfish.jersey.core:jersey-server:3.1.9" : "ad8f08d7,refs=79", From 90853fcd184c7b8459dab6a814f5ce74348e1b62 Mon Sep 17 00:00:00 2001 From: Sanjay Dutt Date: Fri, 22 Nov 2024 18:47:11 +0530 Subject: [PATCH 2/8] Update Jetty deps for s3mock --- gradle/libs.versions.toml | 8 +- .../randomization/policies/solr-tests.policy | 1 + solr/licenses/HdrHistogram-2.1.12.jar.sha1 | 1 - solr/licenses/HdrHistogram-2.2.1.jar.sha1 | 1 + solr/licenses/annotations-2.26.19.jar.sha1 | 1 - solr/licenses/annotations-2.28.11.jar.sha1 | 1 + solr/licenses/apache-client-2.26.19.jar.sha1 | 1 - solr/licenses/apache-client-2.28.11.jar.sha1 | 1 + solr/licenses/arns-2.26.19.jar.sha1 | 1 - solr/licenses/arns-2.28.11.jar.sha1 | 1 + solr/licenses/auth-2.26.19.jar.sha1 | 1 - solr/licenses/auth-2.28.11.jar.sha1 | 1 + solr/licenses/aws-core-2.26.19.jar.sha1 | 1 - solr/licenses/aws-core-2.28.11.jar.sha1 | 1 + .../aws-java-sdk-core-1.12.501.jar.sha1 | 1 - .../aws-java-sdk-core-1.12.729.jar.sha1 | 1 + .../aws-java-sdk-kms-1.12.501.jar.sha1 | 1 - .../aws-java-sdk-kms-1.12.729.jar.sha1 | 1 + .../aws-java-sdk-s3-1.12.501.jar.sha1 | 1 - .../aws-java-sdk-s3-1.12.729.jar.sha1 | 1 + .../aws-query-protocol-2.26.19.jar.sha1 | 1 - .../aws-query-protocol-2.28.11.jar.sha1 | 1 + .../aws-xml-protocol-2.26.19.jar.sha1 | 1 - .../aws-xml-protocol-2.28.11.jar.sha1 | 1 + solr/licenses/checksums-2.26.19.jar.sha1 | 1 - solr/licenses/checksums-2.28.11.jar.sha1 | 1 + solr/licenses/checksums-spi-2.26.19.jar.sha1 | 1 - solr/licenses/checksums-spi-2.28.11.jar.sha1 | 1 + solr/licenses/crt-core-2.26.19.jar.sha1 | 1 - solr/licenses/crt-core-2.28.11.jar.sha1 | 1 + solr/licenses/endpoints-spi-2.26.19.jar.sha1 | 1 - solr/licenses/endpoints-spi-2.28.11.jar.sha1 | 1 + solr/licenses/http-auth-2.26.19.jar.sha1 | 1 - solr/licenses/http-auth-2.28.11.jar.sha1 | 1 + solr/licenses/http-auth-aws-2.26.19.jar.sha1 | 1 - solr/licenses/http-auth-aws-2.28.11.jar.sha1 | 1 + ...http-auth-aws-eventstream-2.28.11.jar.sha1 | 1 + solr/licenses/http-auth-spi-2.26.19.jar.sha1 | 1 - solr/licenses/http-auth-spi-2.28.11.jar.sha1 | 1 + .../licenses/http-client-spi-2.26.19.jar.sha1 | 1 - .../licenses/http-client-spi-2.28.11.jar.sha1 | 1 + solr/licenses/identity-spi-2.26.19.jar.sha1 | 1 - solr/licenses/identity-spi-2.28.11.jar.sha1 | 1 + solr/licenses/ion-java-1.0.2.jar.sha1 | 1 - .../jakarta.servlet-api-4.0.4.jar.sha1 | 1 - .../jakarta.websocket-api-1.1.2.jar.sha1 | 1 - .../jakarta.websocket-api-2.1.1.jar.sha1 | 1 + ...akarta.websocket-client-api-2.1.1.jar.sha1 | 1 + .../jetty-ee10-webapp-12.0.10.jar.sha1 | 1 + ...0-websocket-jakarta-client-12.0.9.jar.sha1 | 1 + ...0-websocket-jakarta-common-12.0.9.jar.sha1 | 1 + ...0-websocket-jakarta-server-12.0.9.jar.sha1 | 1 + ...e10-websocket-jetty-server-12.0.9.jar.sha1 | 1 + ...tty-ee10-websocket-servlet-12.0.9.jar.sha1 | 1 + solr/licenses/jetty-jndi-12.0.10.jar.sha1 | 1 + solr/licenses/jetty-plus-12.0.10.jar.sha1 | 1 + ...etty-websocket-core-client-12.0.9.jar.sha1 | 1 + ...etty-websocket-core-common-12.0.9.jar.sha1 | 1 + ...etty-websocket-core-server-12.0.9.jar.sha1 | 1 + .../jetty-websocket-jetty-api-12.0.9.jar.sha1 | 1 + ...tty-websocket-jetty-common-12.0.9.jar.sha1 | 1 + solr/licenses/jmespath-java-1.12.501.jar.sha1 | 1 - solr/licenses/jmespath-java-1.12.729.jar.sha1 | 1 + solr/licenses/json-utils-2.26.19.jar.sha1 | 1 - solr/licenses/json-utils-2.28.11.jar.sha1 | 1 + solr/licenses/metrics-spi-2.26.19.jar.sha1 | 1 - solr/licenses/metrics-spi-2.28.11.jar.sha1 | 1 + .../micrometer-commons-1.13.0.jar.sha1 | 1 + solr/licenses/micrometer-core-1.13.0.jar.sha1 | 1 + solr/licenses/micrometer-core-1.9.12.jar.sha1 | 1 - .../micrometer-jakarta9-1.13.0.jar.sha1 | 1 + .../micrometer-observation-1.13.0.jar.sha1 | 1 + solr/licenses/profiles-2.26.19.jar.sha1 | 1 - solr/licenses/profiles-2.28.11.jar.sha1 | 1 + solr/licenses/protocol-core-2.26.19.jar.sha1 | 1 - solr/licenses/protocol-core-2.28.11.jar.sha1 | 1 + solr/licenses/regions-2.26.19.jar.sha1 | 1 - solr/licenses/regions-2.28.11.jar.sha1 | 1 + solr/licenses/retries-2.26.19.jar.sha1 | 1 - solr/licenses/retries-2.28.11.jar.sha1 | 1 + solr/licenses/retries-spi-2.26.19.jar.sha1 | 1 - solr/licenses/retries-spi-2.28.11.jar.sha1 | 1 + solr/licenses/s3-2.26.19.jar.sha1 | 1 - solr/licenses/s3-2.28.11.jar.sha1 | 1 + solr/licenses/s3mock-2.17.0.jar.sha1 | 1 - solr/licenses/s3mock-3.9.1.jar.sha1 | 1 + solr/licenses/s3mock-junit4-2.17.0.jar.sha1 | 1 - solr/licenses/s3mock-junit4-3.9.1.jar.sha1 | 1 + .../s3mock-testsupport-common-2.17.0.jar.sha1 | 1 - .../s3mock-testsupport-common-3.9.1.jar.sha1 | 1 + solr/licenses/sdk-core-2.26.19.jar.sha1 | 1 - solr/licenses/sdk-core-2.28.11.jar.sha1 | 1 + solr/licenses/snakeyaml-1.30.jar.sha1 | 1 - solr/licenses/snakeyaml-2.2.jar.sha1 | 1 + solr/licenses/spring-aop-5.3.28.jar.sha1 | 1 - solr/licenses/spring-aop-6.1.8.jar.sha1 | 1 + solr/licenses/spring-beans-5.3.28.jar.sha1 | 1 - solr/licenses/spring-beans-6.1.8.jar.sha1 | 1 + solr/licenses/spring-boot-2.7.13.jar.sha1 | 1 - solr/licenses/spring-boot-3.3.0.jar.sha1 | 1 + .../spring-boot-actuator-2.7.13.jar.sha1 | 1 - .../spring-boot-actuator-3.3.0.jar.sha1 | 1 + ...oot-actuator-autoconfigure-2.7.13.jar.sha1 | 1 - ...boot-actuator-autoconfigure-3.3.0.jar.sha1 | 1 + .../spring-boot-autoconfigure-2.7.13.jar.sha1 | 1 - .../spring-boot-autoconfigure-3.3.0.jar.sha1 | 1 + .../spring-boot-starter-2.7.13.jar.sha1 | 1 - .../spring-boot-starter-3.3.0.jar.sha1 | 1 + ...ring-boot-starter-actuator-2.7.13.jar.sha1 | 1 - ...pring-boot-starter-actuator-3.3.0.jar.sha1 | 1 + .../spring-boot-starter-jetty-2.7.13.jar.sha1 | 1 - .../spring-boot-starter-jetty-3.3.0.jar.sha1 | 1 + .../spring-boot-starter-json-2.7.13.jar.sha1 | 1 - .../spring-boot-starter-json-3.3.0.jar.sha1 | 1 + ...pring-boot-starter-logging-2.7.13.jar.sha1 | 1 - ...spring-boot-starter-logging-3.3.0.jar.sha1 | 1 + .../spring-boot-starter-web-2.7.13.jar.sha1 | 1 - .../spring-boot-starter-web-3.3.0.jar.sha1 | 1 + solr/licenses/spring-context-5.3.28.jar.sha1 | 1 - solr/licenses/spring-context-6.1.8.jar.sha1 | 1 + solr/licenses/spring-core-5.3.28.jar.sha1 | 1 - solr/licenses/spring-core-6.1.8.jar.sha1 | 1 + .../spring-expression-5.3.28.jar.sha1 | 1 - .../licenses/spring-expression-6.1.8.jar.sha1 | 1 + solr/licenses/spring-jcl-5.3.28.jar.sha1 | 1 - solr/licenses/spring-jcl-6.1.8.jar.sha1 | 1 + solr/licenses/spring-web-5.3.28.jar.sha1 | 1 - solr/licenses/spring-web-6.1.8.jar.sha1 | 1 + solr/licenses/spring-webmvc-5.3.28.jar.sha1 | 1 - solr/licenses/spring-webmvc-6.1.8.jar.sha1 | 1 + solr/licenses/sts-2.26.19.jar.sha1 | 1 - solr/licenses/sts-2.28.11.jar.sha1 | 1 + .../third-party-jackson-core-2.26.19.jar.sha1 | 1 - .../third-party-jackson-core-2.28.11.jar.sha1 | 1 + .../licenses/tomcat-embed-el-10.1.24.jar.sha1 | 1 + solr/licenses/tomcat-embed-el-9.0.76.jar.sha1 | 1 - .../url-connection-client-2.26.19.jar.sha1 | 1 - .../url-connection-client-2.28.11.jar.sha1 | 1 + solr/licenses/utils-2.26.19.jar.sha1 | 1 - solr/licenses/utils-2.28.11.jar.sha1 | 1 + solr/modules/s3-repository/build.gradle | 30 +- .../apache/solr/s3/AbstractS3ClientTest.java | 1 + .../solr/s3/S3BackupRepositoryTest.java | 1 + .../solr/s3/S3IncrementalBackupTest.java | 1 + .../apache/solr/s3/S3InstallShardTest.java | 1 + .../apache/solr/s3/S3OutputStreamTest.java | 1 + solr/server/etc/security.policy | 1 + versions.lock | 657 +++++++++++++----- 148 files changed, 592 insertions(+), 248 deletions(-) delete mode 100644 solr/licenses/HdrHistogram-2.1.12.jar.sha1 create mode 100644 solr/licenses/HdrHistogram-2.2.1.jar.sha1 delete mode 100644 solr/licenses/annotations-2.26.19.jar.sha1 create mode 100644 solr/licenses/annotations-2.28.11.jar.sha1 delete mode 100644 solr/licenses/apache-client-2.26.19.jar.sha1 create mode 100644 solr/licenses/apache-client-2.28.11.jar.sha1 delete mode 100644 solr/licenses/arns-2.26.19.jar.sha1 create mode 100644 solr/licenses/arns-2.28.11.jar.sha1 delete mode 100644 solr/licenses/auth-2.26.19.jar.sha1 create mode 100644 solr/licenses/auth-2.28.11.jar.sha1 delete mode 100644 solr/licenses/aws-core-2.26.19.jar.sha1 create mode 100644 solr/licenses/aws-core-2.28.11.jar.sha1 delete mode 100644 solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1 create mode 100644 solr/licenses/aws-java-sdk-core-1.12.729.jar.sha1 delete mode 100644 solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1 create mode 100644 solr/licenses/aws-java-sdk-kms-1.12.729.jar.sha1 delete mode 100644 solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1 create mode 100644 solr/licenses/aws-java-sdk-s3-1.12.729.jar.sha1 delete mode 100644 solr/licenses/aws-query-protocol-2.26.19.jar.sha1 create mode 100644 solr/licenses/aws-query-protocol-2.28.11.jar.sha1 delete mode 100644 solr/licenses/aws-xml-protocol-2.26.19.jar.sha1 create mode 100644 solr/licenses/aws-xml-protocol-2.28.11.jar.sha1 delete mode 100644 solr/licenses/checksums-2.26.19.jar.sha1 create mode 100644 solr/licenses/checksums-2.28.11.jar.sha1 delete mode 100644 solr/licenses/checksums-spi-2.26.19.jar.sha1 create mode 100644 solr/licenses/checksums-spi-2.28.11.jar.sha1 delete mode 100644 solr/licenses/crt-core-2.26.19.jar.sha1 create mode 100644 solr/licenses/crt-core-2.28.11.jar.sha1 delete mode 100644 solr/licenses/endpoints-spi-2.26.19.jar.sha1 create mode 100644 solr/licenses/endpoints-spi-2.28.11.jar.sha1 delete mode 100644 solr/licenses/http-auth-2.26.19.jar.sha1 create mode 100644 solr/licenses/http-auth-2.28.11.jar.sha1 delete mode 100644 solr/licenses/http-auth-aws-2.26.19.jar.sha1 create mode 100644 solr/licenses/http-auth-aws-2.28.11.jar.sha1 create mode 100644 solr/licenses/http-auth-aws-eventstream-2.28.11.jar.sha1 delete mode 100644 solr/licenses/http-auth-spi-2.26.19.jar.sha1 create mode 100644 solr/licenses/http-auth-spi-2.28.11.jar.sha1 delete mode 100644 solr/licenses/http-client-spi-2.26.19.jar.sha1 create mode 100644 solr/licenses/http-client-spi-2.28.11.jar.sha1 delete mode 100644 solr/licenses/identity-spi-2.26.19.jar.sha1 create mode 100644 solr/licenses/identity-spi-2.28.11.jar.sha1 delete mode 100644 solr/licenses/ion-java-1.0.2.jar.sha1 delete mode 100644 solr/licenses/jakarta.servlet-api-4.0.4.jar.sha1 delete mode 100644 solr/licenses/jakarta.websocket-api-1.1.2.jar.sha1 create mode 100644 solr/licenses/jakarta.websocket-api-2.1.1.jar.sha1 create mode 100644 solr/licenses/jakarta.websocket-client-api-2.1.1.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-webapp-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-websocket-jakarta-client-12.0.9.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-websocket-jakarta-common-12.0.9.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-websocket-jakarta-server-12.0.9.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-websocket-jetty-server-12.0.9.jar.sha1 create mode 100644 solr/licenses/jetty-ee10-websocket-servlet-12.0.9.jar.sha1 create mode 100644 solr/licenses/jetty-jndi-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-plus-12.0.10.jar.sha1 create mode 100644 solr/licenses/jetty-websocket-core-client-12.0.9.jar.sha1 create mode 100644 solr/licenses/jetty-websocket-core-common-12.0.9.jar.sha1 create mode 100644 solr/licenses/jetty-websocket-core-server-12.0.9.jar.sha1 create mode 100644 solr/licenses/jetty-websocket-jetty-api-12.0.9.jar.sha1 create mode 100644 solr/licenses/jetty-websocket-jetty-common-12.0.9.jar.sha1 delete mode 100644 solr/licenses/jmespath-java-1.12.501.jar.sha1 create mode 100644 solr/licenses/jmespath-java-1.12.729.jar.sha1 delete mode 100644 solr/licenses/json-utils-2.26.19.jar.sha1 create mode 100644 solr/licenses/json-utils-2.28.11.jar.sha1 delete mode 100644 solr/licenses/metrics-spi-2.26.19.jar.sha1 create mode 100644 solr/licenses/metrics-spi-2.28.11.jar.sha1 create mode 100644 solr/licenses/micrometer-commons-1.13.0.jar.sha1 create mode 100644 solr/licenses/micrometer-core-1.13.0.jar.sha1 delete mode 100644 solr/licenses/micrometer-core-1.9.12.jar.sha1 create mode 100644 solr/licenses/micrometer-jakarta9-1.13.0.jar.sha1 create mode 100644 solr/licenses/micrometer-observation-1.13.0.jar.sha1 delete mode 100644 solr/licenses/profiles-2.26.19.jar.sha1 create mode 100644 solr/licenses/profiles-2.28.11.jar.sha1 delete mode 100644 solr/licenses/protocol-core-2.26.19.jar.sha1 create mode 100644 solr/licenses/protocol-core-2.28.11.jar.sha1 delete mode 100644 solr/licenses/regions-2.26.19.jar.sha1 create mode 100644 solr/licenses/regions-2.28.11.jar.sha1 delete mode 100644 solr/licenses/retries-2.26.19.jar.sha1 create mode 100644 solr/licenses/retries-2.28.11.jar.sha1 delete mode 100644 solr/licenses/retries-spi-2.26.19.jar.sha1 create mode 100644 solr/licenses/retries-spi-2.28.11.jar.sha1 delete mode 100644 solr/licenses/s3-2.26.19.jar.sha1 create mode 100644 solr/licenses/s3-2.28.11.jar.sha1 delete mode 100644 solr/licenses/s3mock-2.17.0.jar.sha1 create mode 100644 solr/licenses/s3mock-3.9.1.jar.sha1 delete mode 100644 solr/licenses/s3mock-junit4-2.17.0.jar.sha1 create mode 100644 solr/licenses/s3mock-junit4-3.9.1.jar.sha1 delete mode 100644 solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1 create mode 100644 solr/licenses/s3mock-testsupport-common-3.9.1.jar.sha1 delete mode 100644 solr/licenses/sdk-core-2.26.19.jar.sha1 create mode 100644 solr/licenses/sdk-core-2.28.11.jar.sha1 delete mode 100644 solr/licenses/snakeyaml-1.30.jar.sha1 create mode 100644 solr/licenses/snakeyaml-2.2.jar.sha1 delete mode 100644 solr/licenses/spring-aop-5.3.28.jar.sha1 create mode 100644 solr/licenses/spring-aop-6.1.8.jar.sha1 delete mode 100644 solr/licenses/spring-beans-5.3.28.jar.sha1 create mode 100644 solr/licenses/spring-beans-6.1.8.jar.sha1 delete mode 100644 solr/licenses/spring-boot-2.7.13.jar.sha1 create mode 100644 solr/licenses/spring-boot-3.3.0.jar.sha1 delete mode 100644 solr/licenses/spring-boot-actuator-2.7.13.jar.sha1 create mode 100644 solr/licenses/spring-boot-actuator-3.3.0.jar.sha1 delete mode 100644 solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1 create mode 100644 solr/licenses/spring-boot-actuator-autoconfigure-3.3.0.jar.sha1 delete mode 100644 solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1 create mode 100644 solr/licenses/spring-boot-autoconfigure-3.3.0.jar.sha1 delete mode 100644 solr/licenses/spring-boot-starter-2.7.13.jar.sha1 create mode 100644 solr/licenses/spring-boot-starter-3.3.0.jar.sha1 delete mode 100644 solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1 create mode 100644 solr/licenses/spring-boot-starter-actuator-3.3.0.jar.sha1 delete mode 100644 solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1 create mode 100644 solr/licenses/spring-boot-starter-jetty-3.3.0.jar.sha1 delete mode 100644 solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1 create mode 100644 solr/licenses/spring-boot-starter-json-3.3.0.jar.sha1 delete mode 100644 solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1 create mode 100644 solr/licenses/spring-boot-starter-logging-3.3.0.jar.sha1 delete mode 100644 solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1 create mode 100644 solr/licenses/spring-boot-starter-web-3.3.0.jar.sha1 delete mode 100644 solr/licenses/spring-context-5.3.28.jar.sha1 create mode 100644 solr/licenses/spring-context-6.1.8.jar.sha1 delete mode 100644 solr/licenses/spring-core-5.3.28.jar.sha1 create mode 100644 solr/licenses/spring-core-6.1.8.jar.sha1 delete mode 100644 solr/licenses/spring-expression-5.3.28.jar.sha1 create mode 100644 solr/licenses/spring-expression-6.1.8.jar.sha1 delete mode 100644 solr/licenses/spring-jcl-5.3.28.jar.sha1 create mode 100644 solr/licenses/spring-jcl-6.1.8.jar.sha1 delete mode 100644 solr/licenses/spring-web-5.3.28.jar.sha1 create mode 100644 solr/licenses/spring-web-6.1.8.jar.sha1 delete mode 100644 solr/licenses/spring-webmvc-5.3.28.jar.sha1 create mode 100644 solr/licenses/spring-webmvc-6.1.8.jar.sha1 delete mode 100644 solr/licenses/sts-2.26.19.jar.sha1 create mode 100644 solr/licenses/sts-2.28.11.jar.sha1 delete mode 100644 solr/licenses/third-party-jackson-core-2.26.19.jar.sha1 create mode 100644 solr/licenses/third-party-jackson-core-2.28.11.jar.sha1 create mode 100644 solr/licenses/tomcat-embed-el-10.1.24.jar.sha1 delete mode 100644 solr/licenses/tomcat-embed-el-9.0.76.jar.sha1 delete mode 100644 solr/licenses/url-connection-client-2.26.19.jar.sha1 create mode 100644 solr/licenses/url-connection-client-2.28.11.jar.sha1 delete mode 100644 solr/licenses/utils-2.26.19.jar.sha1 create mode 100644 solr/licenses/utils-2.28.11.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index eb7ce67baa6..5a915682edf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. [versions] -adobe-testing-s3mock = "2.17.0" -amazon-awssdk = "2.26.19" +adobe-testing-s3mock = "3.9.1" +amazon-awssdk = "2.28.11" # @keep Antora version used in ref-guide antora = "3.1.4" # @keep Most recent commit as of 2022-06-24, this repo does not have tags @@ -316,6 +316,8 @@ eclipse-jetty-alpnjavaserver = { module = "org.eclipse.jetty:jetty-alpn-java-ser eclipse-jetty-alpnserver = { module = "org.eclipse.jetty:jetty-alpn-server", version.ref = "eclipse-jetty" } eclipse-jetty-client = { module = "org.eclipse.jetty:jetty-client", version.ref = "eclipse-jetty" } eclipse-jetty-deploy = { module = "org.eclipse.jetty:jetty-deploy", version.ref = "eclipse-jetty" } +eclipse-jetty-ee = { module = "org.eclipse.jetty:jetty-ee", version.ref = "eclipse-jetty" } +eclipse-jetty-ee10-webapp = { module = "org.eclipse.jetty.ee10:jetty-ee10-webapp", version.ref = "eclipse-jetty" } eclipse-jetty-ee8-nested = { module = "org.eclipse.jetty.ee8:jetty-ee8-nested", version.ref = "eclipse-jetty" } eclipse-jetty-http = { module = "org.eclipse.jetty:jetty-http", version.ref = "eclipse-jetty" } eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:jetty-http2-client", version.ref = "eclipse-jetty" } @@ -325,6 +327,8 @@ eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:je eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:jetty-http2-server", version.ref = "eclipse-jetty" } eclipse-jetty-io = { module = "org.eclipse.jetty:jetty-io", version.ref = "eclipse-jetty" } eclipse-jetty-jmx = { module = "org.eclipse.jetty:jetty-jmx", version.ref = "eclipse-jetty" } +eclipse-jetty-jndi = { module = "org.eclipse.jetty:jetty-jndi", version.ref = "eclipse-jetty" } +eclipse-jetty-plus = { module = "org.eclipse.jetty:jetty-plus", version.ref = "eclipse-jetty" } eclipse-jetty-rewrite = { module = "org.eclipse.jetty:jetty-rewrite", version.ref = "eclipse-jetty" } eclipse-jetty-security = { module = "org.eclipse.jetty:jetty-security", version.ref = "eclipse-jetty" } eclipse-jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "eclipse-jetty" } diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policy index 61df0871a35..aeee28026b0 100644 --- a/gradle/testing/randomization/policies/solr-tests.policy +++ b/gradle/testing/randomization/policies/solr-tests.policy @@ -158,6 +158,7 @@ grant { // needed by s3mock permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.fs"; + permission java.lang.RuntimePermission "accessSystemModules"; // needed for kafka mockito permission java.lang.RuntimePermission "manageProcess"; diff --git a/solr/licenses/HdrHistogram-2.1.12.jar.sha1 b/solr/licenses/HdrHistogram-2.1.12.jar.sha1 deleted file mode 100644 index 203aa0280e0..00000000000 --- a/solr/licenses/HdrHistogram-2.1.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6eb7552156e0d517ae80cc2247be1427c8d90452 diff --git a/solr/licenses/HdrHistogram-2.2.1.jar.sha1 b/solr/licenses/HdrHistogram-2.2.1.jar.sha1 new file mode 100644 index 00000000000..70b238a3e34 --- /dev/null +++ b/solr/licenses/HdrHistogram-2.2.1.jar.sha1 @@ -0,0 +1 @@ +0eb1feb351f64176c377772a30174e582c0274d5 diff --git a/solr/licenses/annotations-2.26.19.jar.sha1 b/solr/licenses/annotations-2.26.19.jar.sha1 deleted file mode 100644 index a58ed3755e3..00000000000 --- a/solr/licenses/annotations-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -47834df51d057a0ff7f0eb3ded64f3086927acd1 diff --git a/solr/licenses/annotations-2.28.11.jar.sha1 b/solr/licenses/annotations-2.28.11.jar.sha1 new file mode 100644 index 00000000000..799168800ee --- /dev/null +++ b/solr/licenses/annotations-2.28.11.jar.sha1 @@ -0,0 +1 @@ +02c5f2908b483add008f4d3872312e11edbe1547 diff --git a/solr/licenses/apache-client-2.26.19.jar.sha1 b/solr/licenses/apache-client-2.26.19.jar.sha1 deleted file mode 100644 index f9fab3b7548..00000000000 --- a/solr/licenses/apache-client-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -54058c3751d1d86a3c28ecd412aa58b9ec9bc0eb diff --git a/solr/licenses/apache-client-2.28.11.jar.sha1 b/solr/licenses/apache-client-2.28.11.jar.sha1 new file mode 100644 index 00000000000..bcf9f4cf86d --- /dev/null +++ b/solr/licenses/apache-client-2.28.11.jar.sha1 @@ -0,0 +1 @@ +5f0b00415673f785df413c5c21cba7ed295d0048 diff --git a/solr/licenses/arns-2.26.19.jar.sha1 b/solr/licenses/arns-2.26.19.jar.sha1 deleted file mode 100644 index aff791de6d7..00000000000 --- a/solr/licenses/arns-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b7c9f6144aca608be62e8052989e38ed97fe23f8 diff --git a/solr/licenses/arns-2.28.11.jar.sha1 b/solr/licenses/arns-2.28.11.jar.sha1 new file mode 100644 index 00000000000..6c340c94a69 --- /dev/null +++ b/solr/licenses/arns-2.28.11.jar.sha1 @@ -0,0 +1 @@ +add9c5344182449b40b2986d897561ae9b1de5a8 diff --git a/solr/licenses/auth-2.26.19.jar.sha1 b/solr/licenses/auth-2.26.19.jar.sha1 deleted file mode 100644 index 336ff4d51d7..00000000000 --- a/solr/licenses/auth-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dbb408986124b246d98a235bdcb5a77ddd2b6dac diff --git a/solr/licenses/auth-2.28.11.jar.sha1 b/solr/licenses/auth-2.28.11.jar.sha1 new file mode 100644 index 00000000000..314a2eec17c --- /dev/null +++ b/solr/licenses/auth-2.28.11.jar.sha1 @@ -0,0 +1 @@ +7c00d77f8b2b99b2ecc29e14adbbe01433f75301 diff --git a/solr/licenses/aws-core-2.26.19.jar.sha1 b/solr/licenses/aws-core-2.26.19.jar.sha1 deleted file mode 100644 index 6b722c65000..00000000000 --- a/solr/licenses/aws-core-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fd6dd9df23690f4dee72f59c4466dd3384866780 diff --git a/solr/licenses/aws-core-2.28.11.jar.sha1 b/solr/licenses/aws-core-2.28.11.jar.sha1 new file mode 100644 index 00000000000..3a1fefc93e2 --- /dev/null +++ b/solr/licenses/aws-core-2.28.11.jar.sha1 @@ -0,0 +1 @@ +1f3c28035af91e353951e3777058467b85728022 diff --git a/solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1 b/solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1 deleted file mode 100644 index af7f788dfc0..00000000000 --- a/solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -96e3be3b38003a161ee52393974a507797a50d16 diff --git a/solr/licenses/aws-java-sdk-core-1.12.729.jar.sha1 b/solr/licenses/aws-java-sdk-core-1.12.729.jar.sha1 new file mode 100644 index 00000000000..1def3c6e5ac --- /dev/null +++ b/solr/licenses/aws-java-sdk-core-1.12.729.jar.sha1 @@ -0,0 +1 @@ +f1a4e78f2a40e9c1f3c80c07238599b5ad0241ca diff --git a/solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1 b/solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1 deleted file mode 100644 index 69086477449..00000000000 --- a/solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ad3cef50677ecead50802b0dc5830c6e2034166f diff --git a/solr/licenses/aws-java-sdk-kms-1.12.729.jar.sha1 b/solr/licenses/aws-java-sdk-kms-1.12.729.jar.sha1 new file mode 100644 index 00000000000..647ea31ecca --- /dev/null +++ b/solr/licenses/aws-java-sdk-kms-1.12.729.jar.sha1 @@ -0,0 +1 @@ +2124bd0745607506c94f842f2a93a2bb0eec3f34 diff --git a/solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1 b/solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1 deleted file mode 100644 index 5a18ae623b1..00000000000 --- a/solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e085a735bc14c56899f2fdd1beb051505351aa25 diff --git a/solr/licenses/aws-java-sdk-s3-1.12.729.jar.sha1 b/solr/licenses/aws-java-sdk-s3-1.12.729.jar.sha1 new file mode 100644 index 00000000000..45ecfe0f051 --- /dev/null +++ b/solr/licenses/aws-java-sdk-s3-1.12.729.jar.sha1 @@ -0,0 +1 @@ +1a2aec49a0ddb5f7a47022e6779fa5f19516f085 diff --git a/solr/licenses/aws-query-protocol-2.26.19.jar.sha1 b/solr/licenses/aws-query-protocol-2.26.19.jar.sha1 deleted file mode 100644 index 9c5920c3670..00000000000 --- a/solr/licenses/aws-query-protocol-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1ccc7fad24a7f590218a5b92d21619dab561a9e0 diff --git a/solr/licenses/aws-query-protocol-2.28.11.jar.sha1 b/solr/licenses/aws-query-protocol-2.28.11.jar.sha1 new file mode 100644 index 00000000000..f5e2a3a53a0 --- /dev/null +++ b/solr/licenses/aws-query-protocol-2.28.11.jar.sha1 @@ -0,0 +1 @@ +de24225dc148b83b5649433897c5c036158ca13e diff --git a/solr/licenses/aws-xml-protocol-2.26.19.jar.sha1 b/solr/licenses/aws-xml-protocol-2.26.19.jar.sha1 deleted file mode 100644 index b1f9e39bf86..00000000000 --- a/solr/licenses/aws-xml-protocol-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cdccf27268dfa99c209de8c2fe62a1b9e2e6b1e9 diff --git a/solr/licenses/aws-xml-protocol-2.28.11.jar.sha1 b/solr/licenses/aws-xml-protocol-2.28.11.jar.sha1 new file mode 100644 index 00000000000..aca7ad0c080 --- /dev/null +++ b/solr/licenses/aws-xml-protocol-2.28.11.jar.sha1 @@ -0,0 +1 @@ +735dab9ebaffe4306fbb6c42beacbba0591f9c09 diff --git a/solr/licenses/checksums-2.26.19.jar.sha1 b/solr/licenses/checksums-2.26.19.jar.sha1 deleted file mode 100644 index 4a5c54bb987..00000000000 --- a/solr/licenses/checksums-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0e17cfbc8b85ddaa1218ff4d1d45636a4a8b70bb diff --git a/solr/licenses/checksums-2.28.11.jar.sha1 b/solr/licenses/checksums-2.28.11.jar.sha1 new file mode 100644 index 00000000000..85c29fc823a --- /dev/null +++ b/solr/licenses/checksums-2.28.11.jar.sha1 @@ -0,0 +1 @@ +0441d04c94f8787606b9eaeeb4b825fde229e8cc diff --git a/solr/licenses/checksums-spi-2.26.19.jar.sha1 b/solr/licenses/checksums-spi-2.26.19.jar.sha1 deleted file mode 100644 index d2cd2248656..00000000000 --- a/solr/licenses/checksums-spi-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a834f1332f0901c0225a202e6dc5078a74c2549f diff --git a/solr/licenses/checksums-spi-2.28.11.jar.sha1 b/solr/licenses/checksums-spi-2.28.11.jar.sha1 new file mode 100644 index 00000000000..de183064453 --- /dev/null +++ b/solr/licenses/checksums-spi-2.28.11.jar.sha1 @@ -0,0 +1 @@ +852d58804c21125d4e306e821086932d72b687e2 diff --git a/solr/licenses/crt-core-2.26.19.jar.sha1 b/solr/licenses/crt-core-2.26.19.jar.sha1 deleted file mode 100644 index ed8573d988f..00000000000 --- a/solr/licenses/crt-core-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d45abf24cbe0d1109ee46d7a420a07b8ed4358b5 diff --git a/solr/licenses/crt-core-2.28.11.jar.sha1 b/solr/licenses/crt-core-2.28.11.jar.sha1 new file mode 100644 index 00000000000..dabb7b2afee --- /dev/null +++ b/solr/licenses/crt-core-2.28.11.jar.sha1 @@ -0,0 +1 @@ +cc2bb5792b12ab530ffc6c2d163faa0a8075a33b diff --git a/solr/licenses/endpoints-spi-2.26.19.jar.sha1 b/solr/licenses/endpoints-spi-2.26.19.jar.sha1 deleted file mode 100644 index 89faef7415e..00000000000 --- a/solr/licenses/endpoints-spi-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dddc85578a7e0780c3b8d6b167487c665cc466cf diff --git a/solr/licenses/endpoints-spi-2.28.11.jar.sha1 b/solr/licenses/endpoints-spi-2.28.11.jar.sha1 new file mode 100644 index 00000000000..05fa59c5f05 --- /dev/null +++ b/solr/licenses/endpoints-spi-2.28.11.jar.sha1 @@ -0,0 +1 @@ +5438bfe4a4c112b65a4dc983dbd74196936a2404 diff --git a/solr/licenses/http-auth-2.26.19.jar.sha1 b/solr/licenses/http-auth-2.26.19.jar.sha1 deleted file mode 100644 index 188f29c99b8..00000000000 --- a/solr/licenses/http-auth-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -00a5edbeae2e1eb33e6a892aebcbe656e5383b85 diff --git a/solr/licenses/http-auth-2.28.11.jar.sha1 b/solr/licenses/http-auth-2.28.11.jar.sha1 new file mode 100644 index 00000000000..535d7df7bd4 --- /dev/null +++ b/solr/licenses/http-auth-2.28.11.jar.sha1 @@ -0,0 +1 @@ +546f4cc761be44bc6d60373c83d11eb320596c40 diff --git a/solr/licenses/http-auth-aws-2.26.19.jar.sha1 b/solr/licenses/http-auth-aws-2.26.19.jar.sha1 deleted file mode 100644 index c71df0e972a..00000000000 --- a/solr/licenses/http-auth-aws-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3719977d245d077745351322859a87329c574d12 diff --git a/solr/licenses/http-auth-aws-2.28.11.jar.sha1 b/solr/licenses/http-auth-aws-2.28.11.jar.sha1 new file mode 100644 index 00000000000..5e41889ca3c --- /dev/null +++ b/solr/licenses/http-auth-aws-2.28.11.jar.sha1 @@ -0,0 +1 @@ +5754a1803ba62de29f9fefc99a7fdb40980b8a25 diff --git a/solr/licenses/http-auth-aws-eventstream-2.28.11.jar.sha1 b/solr/licenses/http-auth-aws-eventstream-2.28.11.jar.sha1 new file mode 100644 index 00000000000..5117313e2f4 --- /dev/null +++ b/solr/licenses/http-auth-aws-eventstream-2.28.11.jar.sha1 @@ -0,0 +1 @@ +1f1d9026881fc9427499b3135b4eb3b91a7c666d diff --git a/solr/licenses/http-auth-spi-2.26.19.jar.sha1 b/solr/licenses/http-auth-spi-2.26.19.jar.sha1 deleted file mode 100644 index 54ceb69be72..00000000000 --- a/solr/licenses/http-auth-spi-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2e467bd25665e7df9e355fc935dd43730ce3c798 diff --git a/solr/licenses/http-auth-spi-2.28.11.jar.sha1 b/solr/licenses/http-auth-spi-2.28.11.jar.sha1 new file mode 100644 index 00000000000..788fa601a2e --- /dev/null +++ b/solr/licenses/http-auth-spi-2.28.11.jar.sha1 @@ -0,0 +1 @@ +948de74944a06f2e25a105bf1cd84635e327865c diff --git a/solr/licenses/http-client-spi-2.26.19.jar.sha1 b/solr/licenses/http-client-spi-2.26.19.jar.sha1 deleted file mode 100644 index 0b6f0836437..00000000000 --- a/solr/licenses/http-client-spi-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -55521082ba7db12101a0f631de46b281f8e08d26 diff --git a/solr/licenses/http-client-spi-2.28.11.jar.sha1 b/solr/licenses/http-client-spi-2.28.11.jar.sha1 new file mode 100644 index 00000000000..8c550a5023e --- /dev/null +++ b/solr/licenses/http-client-spi-2.28.11.jar.sha1 @@ -0,0 +1 @@ +4800dcec303519b3c7583c4d3e813548165660cc diff --git a/solr/licenses/identity-spi-2.26.19.jar.sha1 b/solr/licenses/identity-spi-2.26.19.jar.sha1 deleted file mode 100644 index a9d6e53608d..00000000000 --- a/solr/licenses/identity-spi-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a46f1e3ec3ce5f37c36e9a67ff497a999b99953c diff --git a/solr/licenses/identity-spi-2.28.11.jar.sha1 b/solr/licenses/identity-spi-2.28.11.jar.sha1 new file mode 100644 index 00000000000..af9f9dea651 --- /dev/null +++ b/solr/licenses/identity-spi-2.28.11.jar.sha1 @@ -0,0 +1 @@ +94c677422dd17a2343b01b4d4c8173022da51dad diff --git a/solr/licenses/ion-java-1.0.2.jar.sha1 b/solr/licenses/ion-java-1.0.2.jar.sha1 deleted file mode 100644 index e7881f46181..00000000000 --- a/solr/licenses/ion-java-1.0.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee9dacea7726e495f8352b81c12c23834ffbc564 diff --git a/solr/licenses/jakarta.servlet-api-4.0.4.jar.sha1 b/solr/licenses/jakarta.servlet-api-4.0.4.jar.sha1 deleted file mode 100644 index 560414cce55..00000000000 --- a/solr/licenses/jakarta.servlet-api-4.0.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b8a1142e04838fe54194049c6e7a18dae8f9b960 diff --git a/solr/licenses/jakarta.websocket-api-1.1.2.jar.sha1 b/solr/licenses/jakarta.websocket-api-1.1.2.jar.sha1 deleted file mode 100644 index 5fa444de926..00000000000 --- a/solr/licenses/jakarta.websocket-api-1.1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -69c2fdfb75081cc935bc9d6c5616d12b0b73815f diff --git a/solr/licenses/jakarta.websocket-api-2.1.1.jar.sha1 b/solr/licenses/jakarta.websocket-api-2.1.1.jar.sha1 new file mode 100644 index 00000000000..2d2ed3df09a --- /dev/null +++ b/solr/licenses/jakarta.websocket-api-2.1.1.jar.sha1 @@ -0,0 +1 @@ +d3614cd4fe86803efe3f94d57f17925d3edff712 diff --git a/solr/licenses/jakarta.websocket-client-api-2.1.1.jar.sha1 b/solr/licenses/jakarta.websocket-client-api-2.1.1.jar.sha1 new file mode 100644 index 00000000000..e01953c02e9 --- /dev/null +++ b/solr/licenses/jakarta.websocket-client-api-2.1.1.jar.sha1 @@ -0,0 +1 @@ +bc149b7e22d6b2372835a3124cbcf24924982874 diff --git a/solr/licenses/jetty-ee10-webapp-12.0.10.jar.sha1 b/solr/licenses/jetty-ee10-webapp-12.0.10.jar.sha1 new file mode 100644 index 00000000000..e9f30253f2c --- /dev/null +++ b/solr/licenses/jetty-ee10-webapp-12.0.10.jar.sha1 @@ -0,0 +1 @@ +8eab75fc65cb5d9d0058894ab37fb21e6c9415be diff --git a/solr/licenses/jetty-ee10-websocket-jakarta-client-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jakarta-client-12.0.9.jar.sha1 new file mode 100644 index 00000000000..00f91fba573 --- /dev/null +++ b/solr/licenses/jetty-ee10-websocket-jakarta-client-12.0.9.jar.sha1 @@ -0,0 +1 @@ +7857f53162fa1a682839cff0e452da31f2320d80 diff --git a/solr/licenses/jetty-ee10-websocket-jakarta-common-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jakarta-common-12.0.9.jar.sha1 new file mode 100644 index 00000000000..e839e03e147 --- /dev/null +++ b/solr/licenses/jetty-ee10-websocket-jakarta-common-12.0.9.jar.sha1 @@ -0,0 +1 @@ +af53d13b7bc504169a54a562ea625c2043956a9b diff --git a/solr/licenses/jetty-ee10-websocket-jakarta-server-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jakarta-server-12.0.9.jar.sha1 new file mode 100644 index 00000000000..4039dc662e6 --- /dev/null +++ b/solr/licenses/jetty-ee10-websocket-jakarta-server-12.0.9.jar.sha1 @@ -0,0 +1 @@ +3661146be381bda70fb82453fd622f2a0dd6a6bf diff --git a/solr/licenses/jetty-ee10-websocket-jetty-server-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jetty-server-12.0.9.jar.sha1 new file mode 100644 index 00000000000..241212a35fa --- /dev/null +++ b/solr/licenses/jetty-ee10-websocket-jetty-server-12.0.9.jar.sha1 @@ -0,0 +1 @@ +a16083bac70c75249f7b556c3e2ca363ee2c4b9f diff --git a/solr/licenses/jetty-ee10-websocket-servlet-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-websocket-servlet-12.0.9.jar.sha1 new file mode 100644 index 00000000000..e4ce8a9c501 --- /dev/null +++ b/solr/licenses/jetty-ee10-websocket-servlet-12.0.9.jar.sha1 @@ -0,0 +1 @@ +52baab96dec6fb138418563c41b83f53ce92a7c5 diff --git a/solr/licenses/jetty-jndi-12.0.10.jar.sha1 b/solr/licenses/jetty-jndi-12.0.10.jar.sha1 new file mode 100644 index 00000000000..17b8c5aed3e --- /dev/null +++ b/solr/licenses/jetty-jndi-12.0.10.jar.sha1 @@ -0,0 +1 @@ +1a5e08037c96a96f71ef2c3a940d0c264d84a381 diff --git a/solr/licenses/jetty-plus-12.0.10.jar.sha1 b/solr/licenses/jetty-plus-12.0.10.jar.sha1 new file mode 100644 index 00000000000..9be668f6e31 --- /dev/null +++ b/solr/licenses/jetty-plus-12.0.10.jar.sha1 @@ -0,0 +1 @@ +b933937182de900d4d340b90ab1e82469879897b diff --git a/solr/licenses/jetty-websocket-core-client-12.0.9.jar.sha1 b/solr/licenses/jetty-websocket-core-client-12.0.9.jar.sha1 new file mode 100644 index 00000000000..b5a1305f157 --- /dev/null +++ b/solr/licenses/jetty-websocket-core-client-12.0.9.jar.sha1 @@ -0,0 +1 @@ +23952a10dd9af3d6eb2e3c5805880a8e988f2da6 diff --git a/solr/licenses/jetty-websocket-core-common-12.0.9.jar.sha1 b/solr/licenses/jetty-websocket-core-common-12.0.9.jar.sha1 new file mode 100644 index 00000000000..9bd6747bba4 --- /dev/null +++ b/solr/licenses/jetty-websocket-core-common-12.0.9.jar.sha1 @@ -0,0 +1 @@ +3c8c060afe4fbd4c35b2b661c5dd6edf4f50f720 diff --git a/solr/licenses/jetty-websocket-core-server-12.0.9.jar.sha1 b/solr/licenses/jetty-websocket-core-server-12.0.9.jar.sha1 new file mode 100644 index 00000000000..d10b81d40da --- /dev/null +++ b/solr/licenses/jetty-websocket-core-server-12.0.9.jar.sha1 @@ -0,0 +1 @@ +4e23d72fc838bc818945a2bf59ba4f8b92a589ab diff --git a/solr/licenses/jetty-websocket-jetty-api-12.0.9.jar.sha1 b/solr/licenses/jetty-websocket-jetty-api-12.0.9.jar.sha1 new file mode 100644 index 00000000000..c0c73d2be82 --- /dev/null +++ b/solr/licenses/jetty-websocket-jetty-api-12.0.9.jar.sha1 @@ -0,0 +1 @@ +2e627889a98a7107862037ae161862a3b07c0c39 diff --git a/solr/licenses/jetty-websocket-jetty-common-12.0.9.jar.sha1 b/solr/licenses/jetty-websocket-jetty-common-12.0.9.jar.sha1 new file mode 100644 index 00000000000..cfa785439b6 --- /dev/null +++ b/solr/licenses/jetty-websocket-jetty-common-12.0.9.jar.sha1 @@ -0,0 +1 @@ +33cedefd3dbc970a17ab9a26091988b6989ff0d2 diff --git a/solr/licenses/jmespath-java-1.12.501.jar.sha1 b/solr/licenses/jmespath-java-1.12.501.jar.sha1 deleted file mode 100644 index baf747d0cf3..00000000000 --- a/solr/licenses/jmespath-java-1.12.501.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -941d0bade80af32bb3ac0fc77ae3691ef6515af8 diff --git a/solr/licenses/jmespath-java-1.12.729.jar.sha1 b/solr/licenses/jmespath-java-1.12.729.jar.sha1 new file mode 100644 index 00000000000..d1583e6b5b2 --- /dev/null +++ b/solr/licenses/jmespath-java-1.12.729.jar.sha1 @@ -0,0 +1 @@ +9e8c90c3cc0855a82a12b604fac27fb9b6b91a72 diff --git a/solr/licenses/json-utils-2.26.19.jar.sha1 b/solr/licenses/json-utils-2.26.19.jar.sha1 deleted file mode 100644 index 93123703512..00000000000 --- a/solr/licenses/json-utils-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e866ad2846e382bce87587c974774ff5e8f8b7ae diff --git a/solr/licenses/json-utils-2.28.11.jar.sha1 b/solr/licenses/json-utils-2.28.11.jar.sha1 new file mode 100644 index 00000000000..aabbde82b19 --- /dev/null +++ b/solr/licenses/json-utils-2.28.11.jar.sha1 @@ -0,0 +1 @@ +6682ce958e76a2225e0b72aea77d766b93df405f diff --git a/solr/licenses/metrics-spi-2.26.19.jar.sha1 b/solr/licenses/metrics-spi-2.26.19.jar.sha1 deleted file mode 100644 index c6803188462..00000000000 --- a/solr/licenses/metrics-spi-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2360eb26fd8766632819efef6aa31d9d6f490776 diff --git a/solr/licenses/metrics-spi-2.28.11.jar.sha1 b/solr/licenses/metrics-spi-2.28.11.jar.sha1 new file mode 100644 index 00000000000..74c84799404 --- /dev/null +++ b/solr/licenses/metrics-spi-2.28.11.jar.sha1 @@ -0,0 +1 @@ +5191ee9d98a0d92ac4dba454ff21941f2d308cf5 diff --git a/solr/licenses/micrometer-commons-1.13.0.jar.sha1 b/solr/licenses/micrometer-commons-1.13.0.jar.sha1 new file mode 100644 index 00000000000..4f1a88eab78 --- /dev/null +++ b/solr/licenses/micrometer-commons-1.13.0.jar.sha1 @@ -0,0 +1 @@ +156a59aff8d72c5e631eb4a2d739373ed5881609 diff --git a/solr/licenses/micrometer-core-1.13.0.jar.sha1 b/solr/licenses/micrometer-core-1.13.0.jar.sha1 new file mode 100644 index 00000000000..a746a15c08a --- /dev/null +++ b/solr/licenses/micrometer-core-1.13.0.jar.sha1 @@ -0,0 +1 @@ +d7ed656fbc54fde5a03d978fc0d66f270cc4a997 diff --git a/solr/licenses/micrometer-core-1.9.12.jar.sha1 b/solr/licenses/micrometer-core-1.9.12.jar.sha1 deleted file mode 100644 index 9f3ee82e101..00000000000 --- a/solr/licenses/micrometer-core-1.9.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1077e4cce74894bbe96c79d380781820ba3dfd44 diff --git a/solr/licenses/micrometer-jakarta9-1.13.0.jar.sha1 b/solr/licenses/micrometer-jakarta9-1.13.0.jar.sha1 new file mode 100644 index 00000000000..25066ab1dbd --- /dev/null +++ b/solr/licenses/micrometer-jakarta9-1.13.0.jar.sha1 @@ -0,0 +1 @@ +5d6820df50cba9ef893bf026eacf5a6093945ac7 diff --git a/solr/licenses/micrometer-observation-1.13.0.jar.sha1 b/solr/licenses/micrometer-observation-1.13.0.jar.sha1 new file mode 100644 index 00000000000..0be5fc77b26 --- /dev/null +++ b/solr/licenses/micrometer-observation-1.13.0.jar.sha1 @@ -0,0 +1 @@ +5aa75fbb4367dc3b28e557d14535d21335dc8985 diff --git a/solr/licenses/profiles-2.26.19.jar.sha1 b/solr/licenses/profiles-2.26.19.jar.sha1 deleted file mode 100644 index 2f8dd920e43..00000000000 --- a/solr/licenses/profiles-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c87029de02f4916fd11a9b6ff17e7b9de67d7e1b diff --git a/solr/licenses/profiles-2.28.11.jar.sha1 b/solr/licenses/profiles-2.28.11.jar.sha1 new file mode 100644 index 00000000000..d1704f80925 --- /dev/null +++ b/solr/licenses/profiles-2.28.11.jar.sha1 @@ -0,0 +1 @@ +b304d71730de3a2fd28ae9b8bbed9db7a987948f diff --git a/solr/licenses/protocol-core-2.26.19.jar.sha1 b/solr/licenses/protocol-core-2.26.19.jar.sha1 deleted file mode 100644 index 7ae31d9206b..00000000000 --- a/solr/licenses/protocol-core-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -89a592ca1463b57f68c56c991d364db902250c88 diff --git a/solr/licenses/protocol-core-2.28.11.jar.sha1 b/solr/licenses/protocol-core-2.28.11.jar.sha1 new file mode 100644 index 00000000000..7489eec61ce --- /dev/null +++ b/solr/licenses/protocol-core-2.28.11.jar.sha1 @@ -0,0 +1 @@ +01b9ab7d647399d0e285857bfa31a449def879f5 diff --git a/solr/licenses/regions-2.26.19.jar.sha1 b/solr/licenses/regions-2.26.19.jar.sha1 deleted file mode 100644 index 5baf3283341..00000000000 --- a/solr/licenses/regions-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c5b14483c17d2627f9cab1a2e9d06cfd422aa0b0 diff --git a/solr/licenses/regions-2.28.11.jar.sha1 b/solr/licenses/regions-2.28.11.jar.sha1 new file mode 100644 index 00000000000..439e1ec7016 --- /dev/null +++ b/solr/licenses/regions-2.28.11.jar.sha1 @@ -0,0 +1 @@ +f2bbe35d666beb19d7f25bf82db76cff96351ec6 diff --git a/solr/licenses/retries-2.26.19.jar.sha1 b/solr/licenses/retries-2.26.19.jar.sha1 deleted file mode 100644 index 2cdea5c8297..00000000000 --- a/solr/licenses/retries-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fbc3800df38512d13b8e661af7197ae8b93713ea diff --git a/solr/licenses/retries-2.28.11.jar.sha1 b/solr/licenses/retries-2.28.11.jar.sha1 new file mode 100644 index 00000000000..e5d49886c60 --- /dev/null +++ b/solr/licenses/retries-2.28.11.jar.sha1 @@ -0,0 +1 @@ +dd24a56039450b88479b3ad1948f5e4e0f8aeda7 diff --git a/solr/licenses/retries-spi-2.26.19.jar.sha1 b/solr/licenses/retries-spi-2.26.19.jar.sha1 deleted file mode 100644 index 02774e82373..00000000000 --- a/solr/licenses/retries-spi-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e3e97bb57fea9a82925d2669af723689667bb219 diff --git a/solr/licenses/retries-spi-2.28.11.jar.sha1 b/solr/licenses/retries-spi-2.28.11.jar.sha1 new file mode 100644 index 00000000000..362a5e32b44 --- /dev/null +++ b/solr/licenses/retries-spi-2.28.11.jar.sha1 @@ -0,0 +1 @@ +90ab28b9fda62e803267790f44d27b0d470bf390 diff --git a/solr/licenses/s3-2.26.19.jar.sha1 b/solr/licenses/s3-2.26.19.jar.sha1 deleted file mode 100644 index 84387d9d42d..00000000000 --- a/solr/licenses/s3-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d0d08f386ee8a6d8a6b31f360da5d4ba387c9acf diff --git a/solr/licenses/s3-2.28.11.jar.sha1 b/solr/licenses/s3-2.28.11.jar.sha1 new file mode 100644 index 00000000000..bcc5dde6302 --- /dev/null +++ b/solr/licenses/s3-2.28.11.jar.sha1 @@ -0,0 +1 @@ +50bcd5df8d7c698bacefd54429b1feb29c00534f diff --git a/solr/licenses/s3mock-2.17.0.jar.sha1 b/solr/licenses/s3mock-2.17.0.jar.sha1 deleted file mode 100644 index 878d6fb5886..00000000000 --- a/solr/licenses/s3mock-2.17.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e5857753b28d06f6728f6200f94e5be299c8631c diff --git a/solr/licenses/s3mock-3.9.1.jar.sha1 b/solr/licenses/s3mock-3.9.1.jar.sha1 new file mode 100644 index 00000000000..fdaa243be10 --- /dev/null +++ b/solr/licenses/s3mock-3.9.1.jar.sha1 @@ -0,0 +1 @@ +0409bf53faf473eb889904df726fc6e9b5ba0b46 diff --git a/solr/licenses/s3mock-junit4-2.17.0.jar.sha1 b/solr/licenses/s3mock-junit4-2.17.0.jar.sha1 deleted file mode 100644 index 7533e674ae3..00000000000 --- a/solr/licenses/s3mock-junit4-2.17.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e9601a823ef3648544d0c1d0ff14517c1feb0969 diff --git a/solr/licenses/s3mock-junit4-3.9.1.jar.sha1 b/solr/licenses/s3mock-junit4-3.9.1.jar.sha1 new file mode 100644 index 00000000000..a28f2ea2aa3 --- /dev/null +++ b/solr/licenses/s3mock-junit4-3.9.1.jar.sha1 @@ -0,0 +1 @@ +4f647dd83023d1cb81c9857ecd57920d7aa5fa1b diff --git a/solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1 b/solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1 deleted file mode 100644 index 792568cba32..00000000000 --- a/solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a3af9b0bf0bdb001463356c8ebc2569b9ba478f1 diff --git a/solr/licenses/s3mock-testsupport-common-3.9.1.jar.sha1 b/solr/licenses/s3mock-testsupport-common-3.9.1.jar.sha1 new file mode 100644 index 00000000000..d3ce2fefefe --- /dev/null +++ b/solr/licenses/s3mock-testsupport-common-3.9.1.jar.sha1 @@ -0,0 +1 @@ +aceb1843815fea460803cbfcb0e9515061dd3e3a diff --git a/solr/licenses/sdk-core-2.26.19.jar.sha1 b/solr/licenses/sdk-core-2.26.19.jar.sha1 deleted file mode 100644 index 881fecc560b..00000000000 --- a/solr/licenses/sdk-core-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1930ef13ad9bc6e8d4d04e7015512a761a7d5232 diff --git a/solr/licenses/sdk-core-2.28.11.jar.sha1 b/solr/licenses/sdk-core-2.28.11.jar.sha1 new file mode 100644 index 00000000000..53e31f16489 --- /dev/null +++ b/solr/licenses/sdk-core-2.28.11.jar.sha1 @@ -0,0 +1 @@ +fe45c9bc71b45842143f0f929a4d90eb79d527fa diff --git a/solr/licenses/snakeyaml-1.30.jar.sha1 b/solr/licenses/snakeyaml-1.30.jar.sha1 deleted file mode 100644 index 365daa0aef7..00000000000 --- a/solr/licenses/snakeyaml-1.30.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8fde7fe2586328ac3c68db92045e1c8759125000 diff --git a/solr/licenses/snakeyaml-2.2.jar.sha1 b/solr/licenses/snakeyaml-2.2.jar.sha1 new file mode 100644 index 00000000000..7d95bec69db --- /dev/null +++ b/solr/licenses/snakeyaml-2.2.jar.sha1 @@ -0,0 +1 @@ +3af797a25458550a16bf89acc8e4ab2b7f2bfce0 diff --git a/solr/licenses/spring-aop-5.3.28.jar.sha1 b/solr/licenses/spring-aop-5.3.28.jar.sha1 deleted file mode 100644 index 5ce207bde99..00000000000 --- a/solr/licenses/spring-aop-5.3.28.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aada0ea72a3efee5f02f264f90329f7eddedf321 diff --git a/solr/licenses/spring-aop-6.1.8.jar.sha1 b/solr/licenses/spring-aop-6.1.8.jar.sha1 new file mode 100644 index 00000000000..bf70b2a81fe --- /dev/null +++ b/solr/licenses/spring-aop-6.1.8.jar.sha1 @@ -0,0 +1 @@ +ef793a21e405a88d9d32b92cb459c845ee12b271 diff --git a/solr/licenses/spring-beans-5.3.28.jar.sha1 b/solr/licenses/spring-beans-5.3.28.jar.sha1 deleted file mode 100644 index 0391b770009..00000000000 --- a/solr/licenses/spring-beans-5.3.28.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4d232acbb7031963688cf28b1b34134937892c4f diff --git a/solr/licenses/spring-beans-6.1.8.jar.sha1 b/solr/licenses/spring-beans-6.1.8.jar.sha1 new file mode 100644 index 00000000000..b2b12ee3e86 --- /dev/null +++ b/solr/licenses/spring-beans-6.1.8.jar.sha1 @@ -0,0 +1 @@ +79a5e45383542ff514b5328fe277410cf4054f3b diff --git a/solr/licenses/spring-boot-2.7.13.jar.sha1 b/solr/licenses/spring-boot-2.7.13.jar.sha1 deleted file mode 100644 index 9868e93593d..00000000000 --- a/solr/licenses/spring-boot-2.7.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d009fa51c7792c9e510da7e69329baf39591707d diff --git a/solr/licenses/spring-boot-3.3.0.jar.sha1 b/solr/licenses/spring-boot-3.3.0.jar.sha1 new file mode 100644 index 00000000000..7b1361a26a9 --- /dev/null +++ b/solr/licenses/spring-boot-3.3.0.jar.sha1 @@ -0,0 +1 @@ +83d42f81f312d71b9425f58d1d3f9e8970e51b22 diff --git a/solr/licenses/spring-boot-actuator-2.7.13.jar.sha1 b/solr/licenses/spring-boot-actuator-2.7.13.jar.sha1 deleted file mode 100644 index e21fd0ffce2..00000000000 --- a/solr/licenses/spring-boot-actuator-2.7.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fff492093093c580ed528e115a01ae3158f4b674 diff --git a/solr/licenses/spring-boot-actuator-3.3.0.jar.sha1 b/solr/licenses/spring-boot-actuator-3.3.0.jar.sha1 new file mode 100644 index 00000000000..8e3afaf495c --- /dev/null +++ b/solr/licenses/spring-boot-actuator-3.3.0.jar.sha1 @@ -0,0 +1 @@ +14696a25a7c6adc23836a6a1315f90bbafd23cd4 diff --git a/solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1 b/solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1 deleted file mode 100644 index 41e04eafd02..00000000000 --- a/solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d6d16648726ee7dafcd5435f4f66d02ff3338f5f diff --git a/solr/licenses/spring-boot-actuator-autoconfigure-3.3.0.jar.sha1 b/solr/licenses/spring-boot-actuator-autoconfigure-3.3.0.jar.sha1 new file mode 100644 index 00000000000..bc070bced50 --- /dev/null +++ b/solr/licenses/spring-boot-actuator-autoconfigure-3.3.0.jar.sha1 @@ -0,0 +1 @@ +993952c505a09c13a7fd996def6dbaf3bc6b06d9 diff --git a/solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1 deleted file mode 100644 index 63a1f63afbf..00000000000 --- a/solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1b6b9605b1b116e32c372f3b9e15abf7bb17038c diff --git a/solr/licenses/spring-boot-autoconfigure-3.3.0.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-3.3.0.jar.sha1 new file mode 100644 index 00000000000..337f0b12888 --- /dev/null +++ b/solr/licenses/spring-boot-autoconfigure-3.3.0.jar.sha1 @@ -0,0 +1 @@ +1d98cfa94223e6a3a0e0ad301822cef90cc04fbc diff --git a/solr/licenses/spring-boot-starter-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-2.7.13.jar.sha1 deleted file mode 100644 index 77381975a2e..00000000000 --- a/solr/licenses/spring-boot-starter-2.7.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5617ca04b06778877fb80d146dd2d0dd6adb23a8 diff --git a/solr/licenses/spring-boot-starter-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-3.3.0.jar.sha1 new file mode 100644 index 00000000000..1e6e8dd29f7 --- /dev/null +++ b/solr/licenses/spring-boot-starter-3.3.0.jar.sha1 @@ -0,0 +1 @@ +001af929e0fcb10c2bfc3f3619f4ca9049bd927b diff --git a/solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1 deleted file mode 100644 index 00cd8b33892..00000000000 --- a/solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9e21e7d8fe52e5a2c58adf631a14b21ea6b08cbf diff --git a/solr/licenses/spring-boot-starter-actuator-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-3.3.0.jar.sha1 new file mode 100644 index 00000000000..51a69a27c9d --- /dev/null +++ b/solr/licenses/spring-boot-starter-actuator-3.3.0.jar.sha1 @@ -0,0 +1 @@ +0768a4f4e20c529f08e241b3ab5b316ab0567c30 diff --git a/solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1 deleted file mode 100644 index c6d33b2af97..00000000000 --- a/solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1bf057f189e6b511428857c853f7faf6f0591299 diff --git a/solr/licenses/spring-boot-starter-jetty-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-3.3.0.jar.sha1 new file mode 100644 index 00000000000..c4b4d5c7c18 --- /dev/null +++ b/solr/licenses/spring-boot-starter-jetty-3.3.0.jar.sha1 @@ -0,0 +1 @@ +af812b85ea131849172a0fa2d19cf80906b780b8 diff --git a/solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1 deleted file mode 100644 index 51408cd2fa1..00000000000 --- a/solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2fc4c73e9b8602e57d2ffc37545cc2822e948322 diff --git a/solr/licenses/spring-boot-starter-json-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-json-3.3.0.jar.sha1 new file mode 100644 index 00000000000..49094060f66 --- /dev/null +++ b/solr/licenses/spring-boot-starter-json-3.3.0.jar.sha1 @@ -0,0 +1 @@ +1c9938093b372602f121e2b073f490897388cc71 diff --git a/solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1 deleted file mode 100644 index 7de4ef8057a..00000000000 --- a/solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8a5e9bd6fa8341193a977d408b9a44faaa684c8d diff --git a/solr/licenses/spring-boot-starter-logging-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-logging-3.3.0.jar.sha1 new file mode 100644 index 00000000000..a2fcd4144ec --- /dev/null +++ b/solr/licenses/spring-boot-starter-logging-3.3.0.jar.sha1 @@ -0,0 +1 @@ +79a400c9d7ce3a7cecf296fda402e3100a099bce diff --git a/solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1 deleted file mode 100644 index 7f8538e5c66..00000000000 --- a/solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -707bd743fa544ca06a78a657465c1ca0f5084ea4 diff --git a/solr/licenses/spring-boot-starter-web-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-web-3.3.0.jar.sha1 new file mode 100644 index 00000000000..f9e1219de96 --- /dev/null +++ b/solr/licenses/spring-boot-starter-web-3.3.0.jar.sha1 @@ -0,0 +1 @@ +d8f587bc52e6c31dc4f161a49ce8f5e19f8853a9 diff --git a/solr/licenses/spring-context-5.3.28.jar.sha1 b/solr/licenses/spring-context-5.3.28.jar.sha1 deleted file mode 100644 index 7edc60f960b..00000000000 --- a/solr/licenses/spring-context-5.3.28.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -edf8ebfd637e3e10ec7fed697eb69f2a5229748a diff --git a/solr/licenses/spring-context-6.1.8.jar.sha1 b/solr/licenses/spring-context-6.1.8.jar.sha1 new file mode 100644 index 00000000000..c5b302d7033 --- /dev/null +++ b/solr/licenses/spring-context-6.1.8.jar.sha1 @@ -0,0 +1 @@ +21219a0df58e5b96ef489a172b449232573352e8 diff --git a/solr/licenses/spring-core-5.3.28.jar.sha1 b/solr/licenses/spring-core-5.3.28.jar.sha1 deleted file mode 100644 index b2b8b266a61..00000000000 --- a/solr/licenses/spring-core-5.3.28.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b7ec246fef72fdfbb0b4123956715ca89cc6ddf diff --git a/solr/licenses/spring-core-6.1.8.jar.sha1 b/solr/licenses/spring-core-6.1.8.jar.sha1 new file mode 100644 index 00000000000..3e025f4336d --- /dev/null +++ b/solr/licenses/spring-core-6.1.8.jar.sha1 @@ -0,0 +1 @@ +141fc11a5dbaa503fe361150312ad0fa9d9c03da diff --git a/solr/licenses/spring-expression-5.3.28.jar.sha1 b/solr/licenses/spring-expression-5.3.28.jar.sha1 deleted file mode 100644 index 1f8325901d5..00000000000 --- a/solr/licenses/spring-expression-5.3.28.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d049216b1a73b939b36bbf5cc7ce734cace7b245 diff --git a/solr/licenses/spring-expression-6.1.8.jar.sha1 b/solr/licenses/spring-expression-6.1.8.jar.sha1 new file mode 100644 index 00000000000..71982e5c450 --- /dev/null +++ b/solr/licenses/spring-expression-6.1.8.jar.sha1 @@ -0,0 +1 @@ +dcf78ef442c24f32ff8c6a9746e7f5209b330111 diff --git a/solr/licenses/spring-jcl-5.3.28.jar.sha1 b/solr/licenses/spring-jcl-5.3.28.jar.sha1 deleted file mode 100644 index 88be4456192..00000000000 --- a/solr/licenses/spring-jcl-5.3.28.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d67e8b213aa08a0f3d71e547fb4345372d819d36 diff --git a/solr/licenses/spring-jcl-6.1.8.jar.sha1 b/solr/licenses/spring-jcl-6.1.8.jar.sha1 new file mode 100644 index 00000000000..57cc84a7d68 --- /dev/null +++ b/solr/licenses/spring-jcl-6.1.8.jar.sha1 @@ -0,0 +1 @@ +0a545266a6efac9283353a922783a0a06f197ec0 diff --git a/solr/licenses/spring-web-5.3.28.jar.sha1 b/solr/licenses/spring-web-5.3.28.jar.sha1 deleted file mode 100644 index 5a49ed29aa1..00000000000 --- a/solr/licenses/spring-web-5.3.28.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e15c861a248f5ba41dd1ebc691e582bb5f3a2813 diff --git a/solr/licenses/spring-web-6.1.8.jar.sha1 b/solr/licenses/spring-web-6.1.8.jar.sha1 new file mode 100644 index 00000000000..e73e6d37049 --- /dev/null +++ b/solr/licenses/spring-web-6.1.8.jar.sha1 @@ -0,0 +1 @@ +1461405dc325c82a0a058df033bee3d8c6dd6e41 diff --git a/solr/licenses/spring-webmvc-5.3.28.jar.sha1 b/solr/licenses/spring-webmvc-5.3.28.jar.sha1 deleted file mode 100644 index 2d4af9abee1..00000000000 --- a/solr/licenses/spring-webmvc-5.3.28.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -688bde13678e86028062f01dbcdf301308c449e7 diff --git a/solr/licenses/spring-webmvc-6.1.8.jar.sha1 b/solr/licenses/spring-webmvc-6.1.8.jar.sha1 new file mode 100644 index 00000000000..4d39ce16b54 --- /dev/null +++ b/solr/licenses/spring-webmvc-6.1.8.jar.sha1 @@ -0,0 +1 @@ +8496f8c010625bc0b857d19d2e93a9bdd691c1af diff --git a/solr/licenses/sts-2.26.19.jar.sha1 b/solr/licenses/sts-2.26.19.jar.sha1 deleted file mode 100644 index 44a737d3e9e..00000000000 --- a/solr/licenses/sts-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -01ab21034412aa239b92dc9e0962473f818e34b8 diff --git a/solr/licenses/sts-2.28.11.jar.sha1 b/solr/licenses/sts-2.28.11.jar.sha1 new file mode 100644 index 00000000000..1a7702ae97d --- /dev/null +++ b/solr/licenses/sts-2.28.11.jar.sha1 @@ -0,0 +1 @@ +1978ba2a204fbe5caa7167f4fdce6ec6be426882 diff --git a/solr/licenses/third-party-jackson-core-2.26.19.jar.sha1 b/solr/licenses/third-party-jackson-core-2.26.19.jar.sha1 deleted file mode 100644 index b3a2f1c0304..00000000000 --- a/solr/licenses/third-party-jackson-core-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dff07c47bfe117b0da48651cbe035ab1fc140b0e diff --git a/solr/licenses/third-party-jackson-core-2.28.11.jar.sha1 b/solr/licenses/third-party-jackson-core-2.28.11.jar.sha1 new file mode 100644 index 00000000000..b0fbdc08902 --- /dev/null +++ b/solr/licenses/third-party-jackson-core-2.28.11.jar.sha1 @@ -0,0 +1 @@ +b2197b0713e758ffb0e0812943b585c664adfceb diff --git a/solr/licenses/tomcat-embed-el-10.1.24.jar.sha1 b/solr/licenses/tomcat-embed-el-10.1.24.jar.sha1 new file mode 100644 index 00000000000..57fddb64012 --- /dev/null +++ b/solr/licenses/tomcat-embed-el-10.1.24.jar.sha1 @@ -0,0 +1 @@ +6e9c9dce63c10f903cb0aaaeff45f5f7092f5527 diff --git a/solr/licenses/tomcat-embed-el-9.0.76.jar.sha1 b/solr/licenses/tomcat-embed-el-9.0.76.jar.sha1 deleted file mode 100644 index 9b324f897ba..00000000000 --- a/solr/licenses/tomcat-embed-el-9.0.76.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -74bf8925f713a52c2af19fff6df55d80ef87166c diff --git a/solr/licenses/url-connection-client-2.26.19.jar.sha1 b/solr/licenses/url-connection-client-2.26.19.jar.sha1 deleted file mode 100644 index e8d254b091f..00000000000 --- a/solr/licenses/url-connection-client-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cbfdc3bb78c52cd164029ee186e6ed654eb2c423 diff --git a/solr/licenses/url-connection-client-2.28.11.jar.sha1 b/solr/licenses/url-connection-client-2.28.11.jar.sha1 new file mode 100644 index 00000000000..8207992c12a --- /dev/null +++ b/solr/licenses/url-connection-client-2.28.11.jar.sha1 @@ -0,0 +1 @@ +f9c2513e2d091ba9df7091b98028cb0371e15020 diff --git a/solr/licenses/utils-2.26.19.jar.sha1 b/solr/licenses/utils-2.26.19.jar.sha1 deleted file mode 100644 index 9edd808d3db..00000000000 --- a/solr/licenses/utils-2.26.19.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa3cebed414e9509eb0f481213037d53557cd37d diff --git a/solr/licenses/utils-2.28.11.jar.sha1 b/solr/licenses/utils-2.28.11.jar.sha1 new file mode 100644 index 00000000000..f57a1403275 --- /dev/null +++ b/solr/licenses/utils-2.28.11.jar.sha1 @@ -0,0 +1 @@ +467c8ff613540be4eeaebb55b6aac2b01b2461be diff --git a/solr/modules/s3-repository/build.gradle b/solr/modules/s3-repository/build.gradle index 15227d57f47..f4d48f55205 100644 --- a/solr/modules/s3-repository/build.gradle +++ b/solr/modules/s3-repository/build.gradle @@ -20,7 +20,9 @@ apply plugin: 'java-library' description = 'S3 Repository' dependencies { - api project(':solr:core') + api(project(':solr:core')) { + exclude group: 'org.ow2.asm', module: '*' + } implementation project(':solr:solrj') implementation libs.apache.lucene.core @@ -34,7 +36,9 @@ dependencies { implementation(libs.amazon.awssdk.s3) { exclude group: 'software.amazon.awssdk', module: 'netty-nio-client' } - implementation libs.amazon.awssdk.sdkcore + implementation(libs.amazon.awssdk.sdkcore){ + exclude group: 'joda-time', module: 'joda-time' + } runtimeOnly(libs.amazon.awssdk.sts) { exclude group: 'software.amazon.awssdk', module: 'netty-nio-client' } @@ -45,7 +49,9 @@ dependencies { runtimeOnly libs.fasterxml.woodstox.core runtimeOnly libs.codehaus.woodstox.stax2api - testImplementation project(':solr:test-framework') + testImplementation(project(':solr:test-framework')) { + exclude group: 'org.ow2.asm', module: '*' + } testImplementation libs.apache.lucene.testframework testImplementation libs.carrotsearch.randomizedtesting.runner testImplementation libs.junit.junit @@ -64,6 +70,11 @@ dependencies { exclude group: 'org.apache.commons', module: 'commons-lang3' exclude group: 'software.amazon.awssdk', module: 'netty-nio-client' exclude group: 'org.codehaus.woodstox', module: 'stax2-api' + exclude group: 'jakarta.xml.bind', module: 'jakarta.xml.bind-api' + exclude group: 'org.ow2.asm', module: '*' + exclude group: 'org.glassfish.jaxb', module: 'jaxb-runtime' + exclude group: 'joda-time', module: 'joda-time' + exclude group: 'org.eclipse.jetty.ee10', module: '*' } testImplementation(libs.adobe.testing.s3mock.testsupportcommon) { // Don't pull in separate versions of these libs, just use what Solr already has @@ -76,11 +87,22 @@ dependencies { exclude group: 'org.apache.commons', module: 'commons-lang3' exclude group: 'software.amazon.awssdk', module: 'netty-nio-client' exclude group: 'org.codehaus.woodstox', module: 'stax2-api' + exclude group: 'jakarta.xml.bind', module: 'jakarta.xml.bind-api' + exclude group: 'org.ow2.asm', module: '*' + exclude group: 'org.glassfish.jaxb', module: 'jaxb-runtime' + exclude group: 'joda-time', module: 'joda-time' + exclude group: 'org.eclipse.jetty.ee10', module: '*' } testImplementation libs.commonsio.commonsio - testRuntimeOnly libs.eclipse.jetty.webapp + //testRuntimeOnly libs.eclipse.jetty.webapp + testRuntimeOnly(libs.eclipse.jetty.ee10.webapp) { + exclude group: 'org.ow2.asm', module: '*' + } + testRuntimeOnly libs.eclipse.jetty.ee + testRuntimeOnly libs.eclipse.jetty.jndi + testRuntimeOnly libs.eclipse.jetty.plus testImplementation(libs.mockito.core, { exclude group: "net.bytebuddy", module: "byte-buddy-agent" diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java index 3c72dd3a4c1..28788c49222 100644 --- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java +++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java @@ -35,6 +35,7 @@ public class AbstractS3ClientTest extends SolrTestCaseJ4 { private static final String BUCKET_NAME = "test-bucket"; @ClassRule + @SuppressWarnings("removal") public static final S3MockRule S3_MOCK_RULE = S3MockRule.builder().silent().withInitialBuckets(BUCKET_NAME).build(); diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java index 71617a1f028..d5e794b70e8 100644 --- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java +++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java @@ -52,6 +52,7 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @SuppressWarnings("removal") @ClassRule public static final S3MockRule S3_MOCK_RULE = S3MockRule.builder() diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java index d10322253cd..1272a617af0 100644 --- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java +++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java @@ -37,6 +37,7 @@ public class S3IncrementalBackupTest extends AbstractIncrementalBackupTest { private static final String BUCKET_NAME = S3IncrementalBackupTest.class.getSimpleName(); @ClassRule + @SuppressWarnings("removal") public static final S3MockRule S3_MOCK_RULE = S3MockRule.builder() .silent() diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java index ea21cb58877..b088e5b9131 100644 --- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java +++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java @@ -54,6 +54,7 @@ public class S3InstallShardTest extends AbstractInstallShardTest { AbstractInstallShardTest.defaultSolrXmlTextWithBackupRepository(BACKUP_REPOSITORY_XML); @ClassRule + @SuppressWarnings("removal") public static final S3MockRule S3_MOCK_RULE = S3MockRule.builder() .silent() diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java index 1116d3103d4..22011f314f6 100644 --- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java +++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java @@ -33,6 +33,7 @@ public class S3OutputStreamTest extends SolrTestCaseJ4 { private static final String BUCKET = S3OutputStreamTest.class.getSimpleName(); @ClassRule + @SuppressWarnings("removal") public static final S3MockRule S3_MOCK_RULE = S3MockRule.builder().silent().withInitialBuckets(BUCKET).withSecureConnection(false).build(); diff --git a/solr/server/etc/security.policy b/solr/server/etc/security.policy index c898ac8dbfe..c61430ee169 100644 --- a/solr/server/etc/security.policy +++ b/solr/server/etc/security.policy @@ -108,6 +108,7 @@ grant { permission java.lang.RuntimePermission "getProtectionDomain"; // needed by aws s3 sdk (Apache HTTP Client) permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.reflect"; + permission java.lang.RuntimePermission "accessSystemModules"; // These two *have* to be spelled out a separate permission java.lang.management.ManagementPermission "control"; diff --git a/versions.lock b/versions.lock index c31a5af4ede..770538bb64b 100644 --- a/versions.lock +++ b/versions.lock @@ -3,14 +3,14 @@ "configurationGroups" : { "consolidated_dependencies" : { "biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1" : "5fc760f2,refs=1", - "com.adobe.testing:s3mock:2.17.0" : "1e12e466,refs=2", - "com.adobe.testing:s3mock-junit4:2.17.0" : "1e12e466,refs=2", - "com.adobe.testing:s3mock-testsupport-common:2.17.0" : "1e12e466,refs=2", + "com.adobe.testing:s3mock:3.9.1" : "1e12e466,refs=2", + "com.adobe.testing:s3mock-junit4:3.9.1" : "1e12e466,refs=2", + "com.adobe.testing:s3mock-testsupport-common:3.9.1" : "1e12e466,refs=2", "com.adobe.xmp:xmpcore:6.1.10" : "50a667d1,refs=5", - "com.amazonaws:aws-java-sdk-core:1.12.501" : "1e12e466,refs=2", - "com.amazonaws:aws-java-sdk-kms:1.12.501" : "1e12e466,refs=2", - "com.amazonaws:aws-java-sdk-s3:1.12.501" : "1e12e466,refs=2", - "com.amazonaws:jmespath-java:1.12.501" : "1e12e466,refs=2", + "com.amazonaws:aws-java-sdk-core:1.12.729" : "1e12e466,refs=2", + "com.amazonaws:aws-java-sdk-kms:1.12.729" : "1e12e466,refs=2", + "com.amazonaws:aws-java-sdk-s3:1.12.729" : "1e12e466,refs=2", + "com.amazonaws:jmespath-java:1.12.729" : "1e12e466,refs=2", "com.beust:jcommander:1.82" : "50a667d1,refs=5", "com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1" : "06ca9183,refs=52", "com.carrotsearch:hppc:0.10.0" : "3ff3bc39,refs=81", @@ -106,8 +106,8 @@ "com.squareup.okhttp3:okhttp:4.12.0" : "b6a343e2,refs=5", "com.squareup.okio:okio:3.6.0" : "b6a343e2,refs=5", "com.squareup.okio:okio-jvm:3.6.0" : "b6a343e2,refs=5", - "com.sun.activation:jakarta.activation:1.2.2" : "e2f3f42e,refs=4", - "com.sun.istack:istack-commons-runtime:3.0.12" : "debe9836,refs=7", + "com.sun.activation:jakarta.activation:1.2.2" : "97e75301,refs=3", + "com.sun.istack:istack-commons-runtime:3.0.12" : "50a667d1,refs=5", "com.tdunning:t-digest:3.3" : "ad8f08d7,refs=79", "com.thoughtworks.paranamer:paranamer:2.8" : "4bf37e93,refs=3", "com.typesafe.scala-logging:scala-logging_2.13:3.9.4" : "4bf37e93,refs=3", @@ -159,7 +159,10 @@ "io.grpc:grpc-stub:1.65.1" : "cef2dbfe,refs=8", "io.grpc:grpc-util:1.65.1" : "dd724fae,refs=6", "io.grpc:grpc-xds:1.65.1" : "6fb73f3a,refs=3", - "io.micrometer:micrometer-core:1.9.12" : "1e12e466,refs=2", + "io.micrometer:micrometer-commons:1.13.0" : "1e12e466,refs=2", + "io.micrometer:micrometer-core:1.13.0" : "1e12e466,refs=2", + "io.micrometer:micrometer-jakarta9:1.13.0" : "1e12e466,refs=2", + "io.micrometer:micrometer-observation:1.13.0" : "1e12e466,refs=2", "io.netty:netty-bom:4.1.114.Final" : "0d28f997,refs=5", "io.netty:netty-buffer:4.1.114.Final" : "7413b098,refs=124", "io.netty:netty-codec:4.1.114.Final" : "7413b098,refs=124", @@ -206,14 +209,15 @@ "jakarta.activation:jakarta.activation-api:1.2.2" : "50a667d1,refs=5", "jakarta.annotation:jakarta.annotation-api:2.1.1" : "78dd58c9,refs=80", "jakarta.inject:jakarta.inject-api:2.0.1" : "ad8f08d7,refs=79", - "jakarta.servlet:jakarta.servlet-api:4.0.4" : "1e12e466,refs=2", + "jakarta.servlet:jakarta.servlet-api:6.0.0" : "1e12e466,refs=2", "jakarta.validation:jakarta.validation-api:3.0.2" : "ad8f08d7,refs=79", - "jakarta.websocket:jakarta.websocket-api:1.1.2" : "1e12e466,refs=2", + "jakarta.websocket:jakarta.websocket-api:2.1.1" : "1e12e466,refs=2", + "jakarta.websocket:jakarta.websocket-client-api:2.1.1" : "1e12e466,refs=2", "jakarta.ws.rs:jakarta.ws.rs-api:3.1.0" : "76db8e26,refs=87", - "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" : "debe9836,refs=7", + "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" : "50a667d1,refs=5", "javax.inject:javax.inject:1" : "a9dcee72,refs=28", "javax.measure:unit-api:1.0" : "50a667d1,refs=5", - "joda-time:joda-time:2.8.1" : "debe9836,refs=7", + "joda-time:joda-time:2.8.1" : "50a667d1,refs=5", "junit:junit:4.13.2" : "06ca9183,refs=52", "net.arnx:jsonic:1.2.7" : "69bf1b73,refs=5", "net.bytebuddy:byte-buddy:1.14.15" : "5f62bd8e,refs=18", @@ -336,7 +340,7 @@ "org.apache.sis.storage:sis-storage:1.2" : "50a667d1,refs=5", "org.apache.tika:tika-core:1.28.5" : "b6f115a3,refs=10", "org.apache.tika:tika-parsers:1.28.5" : "50a667d1,refs=5", - "org.apache.tomcat.embed:tomcat-embed-el:9.0.76" : "1e12e466,refs=2", + "org.apache.tomcat.embed:tomcat-embed-el:10.1.24" : "1e12e466,refs=2", "org.apache.tomcat:annotations-api:6.0.53" : "781655d3,refs=1", "org.apache.xmlbeans:xmlbeans:5.0.3" : "50a667d1,refs=5", "org.apache.zookeeper:zookeeper:3.9.2" : "7413b098,refs=124", @@ -362,18 +366,29 @@ "org.codehaus.woodstox:stax2-api:4.2.2" : "5b11e899,refs=81", "org.codelibs:jhighlight:1.1.0" : "50a667d1,refs=5", "org.conscrypt:conscrypt-openjdk-uber:2.5.2" : "784a94ea,refs=5", + "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client:12.0.9" : "1e12e466,refs=2", + "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common:12.0.9" : "1e12e466,refs=2", + "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server:12.0.9" : "1e12e466,refs=2", + "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server:12.0.9" : "1e12e466,refs=2", + "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet:12.0.9" : "1e12e466,refs=2", "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.10" : "1f5bde05,refs=47", + "org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.10" : "7df0e72e,refs=1", "org.eclipse.jetty.ee8:jetty-ee8-nested:12.0.10" : "0e779887,refs=59", "org.eclipse.jetty.ee8:jetty-ee8-security:12.0.10" : "0e779887,refs=59", "org.eclipse.jetty.ee8:jetty-ee8-servlet:12.0.10" : "0e779887,refs=59", "org.eclipse.jetty.ee8:jetty-ee8-servlets:12.0.10" : "24396a00,refs=4", - "org.eclipse.jetty.ee8:jetty-ee8-webapp:12.0.10" : "062c26b4,refs=7", + "org.eclipse.jetty.ee8:jetty-ee8-webapp:12.0.10" : "5f3bb7bb,refs=6", "org.eclipse.jetty.http2:jetty-http2-client:12.0.10" : "1b72eeae,refs=128", "org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.10" : "f9ff6c21,refs=84", "org.eclipse.jetty.http2:jetty-http2-common:12.0.10" : "84afbb60,refs=130", "org.eclipse.jetty.http2:jetty-http2-hpack:12.0.10" : "84afbb60,refs=130", "org.eclipse.jetty.http2:jetty-http2-server:12.0.10" : "5967e690,refs=32", "org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6" : "5e82f1c0,refs=109", + "org.eclipse.jetty.websocket:jetty-websocket-core-client:12.0.9" : "1e12e466,refs=2", + "org.eclipse.jetty.websocket:jetty-websocket-core-common:12.0.9" : "1e12e466,refs=2", + "org.eclipse.jetty.websocket:jetty-websocket-core-server:12.0.9" : "1e12e466,refs=2", + "org.eclipse.jetty.websocket:jetty-websocket-jetty-api:12.0.9" : "1e12e466,refs=2", + "org.eclipse.jetty.websocket:jetty-websocket-jetty-common:12.0.9" : "1e12e466,refs=2", "org.eclipse.jetty:jetty-alpn-client:12.0.10" : "1b72eeae,refs=128", "org.eclipse.jetty:jetty-alpn-java-client:12.0.10" : "f9ff6c21,refs=84", "org.eclipse.jetty:jetty-alpn-java-server:12.0.10" : "1069c1cc,refs=30", @@ -384,6 +399,8 @@ "org.eclipse.jetty:jetty-http:12.0.10" : "84afbb60,refs=130", "org.eclipse.jetty:jetty-io:12.0.10" : "84afbb60,refs=130", "org.eclipse.jetty:jetty-jmx:12.0.10" : "24396a00,refs=4", + "org.eclipse.jetty:jetty-jndi:12.0.10" : "7df0e72e,refs=1", + "org.eclipse.jetty:jetty-plus:12.0.10" : "7df0e72e,refs=1", "org.eclipse.jetty:jetty-rewrite:12.0.10" : "5967e690,refs=32", "org.eclipse.jetty:jetty-security:12.0.10" : "0e779887,refs=59", "org.eclipse.jetty:jetty-server:12.0.10" : "d008b72a,refs=107", @@ -398,8 +415,8 @@ "org.glassfish.hk2:hk2-locator:3.1.1" : "ad8f08d7,refs=79", "org.glassfish.hk2:hk2-utils:3.1.1" : "ad8f08d7,refs=79", "org.glassfish.hk2:osgi-resource-locator:1.0.3" : "ad8f08d7,refs=79", - "org.glassfish.jaxb:jaxb-runtime:2.3.8" : "debe9836,refs=7", - "org.glassfish.jaxb:txw2:2.3.8" : "debe9836,refs=7", + "org.glassfish.jaxb:jaxb-runtime:2.3.8" : "50a667d1,refs=5", + "org.glassfish.jaxb:txw2:2.3.8" : "50a667d1,refs=5", "org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.0" : "ad8f08d7,refs=79", "org.glassfish.jersey.core:jersey-client:3.1.9" : "ad8f08d7,refs=79", "org.glassfish.jersey.core:jersey-common:3.1.9" : "ad8f08d7,refs=79", @@ -408,7 +425,7 @@ "org.glassfish.jersey.inject:jersey-hk2:3.1.9" : "ad8f08d7,refs=79", "org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9" : "ad8f08d7,refs=79", "org.hamcrest:hamcrest:3.0" : "06ca9183,refs=52", - "org.hdrhistogram:HdrHistogram:2.1.12" : "1e12e466,refs=2", + "org.hdrhistogram:HdrHistogram:2.2.1" : "7df0e72e,refs=1", "org.hsqldb:hsqldb:2.7.2" : "970f2ee7,refs=1", "org.immutables:value-annotations:2.10.1" : "d3d191b2,refs=1", "org.itadaki:bzip2:0.9.1" : "50a667d1,refs=5", @@ -441,10 +458,10 @@ "org.osgi:org.osgi.resource:1.0.0" : "5fc760f2,refs=1", "org.osgi:org.osgi.service.serviceloader:1.0.0" : "5fc760f2,refs=1", "org.osgi:osgi.annotation:8.1.0" : "5fc760f2,refs=1", - "org.ow2.asm:asm:9.3" : "ddc123c8,refs=80", - "org.ow2.asm:asm-analysis:7.2" : "ebd3db47,refs=77", - "org.ow2.asm:asm-commons:7.2" : "ebd3db47,refs=77", - "org.ow2.asm:asm-tree:7.2" : "ebd3db47,refs=77", + "org.ow2.asm:asm:9.3" : "64f07552,refs=77", + "org.ow2.asm:asm-analysis:7.2" : "dc1a0633,refs=74", + "org.ow2.asm:asm-commons:7.2" : "dc1a0633,refs=74", + "org.ow2.asm:asm-tree:7.2" : "dc1a0633,refs=74", "org.pcollections:pcollections:4.0.1" : "bddbe009,refs=29", "org.quicktheories:quicktheories:0.26" : "52ada00b,refs=4", "org.reactivestreams:reactive-streams:1.0.4" : "87cc13ff,refs=5", @@ -457,24 +474,24 @@ "org.slf4j:jcl-over-slf4j:2.0.13" : "a6fb6a35,refs=86", "org.slf4j:jul-to-slf4j:2.0.13" : "58171492,refs=26", "org.slf4j:slf4j-api:2.0.13" : "5fb053e8,refs=132", - "org.springframework.boot:spring-boot:2.7.13" : "1e12e466,refs=2", - "org.springframework.boot:spring-boot-actuator:2.7.13" : "1e12e466,refs=2", - "org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.13" : "1e12e466,refs=2", - "org.springframework.boot:spring-boot-autoconfigure:2.7.13" : "1e12e466,refs=2", - "org.springframework.boot:spring-boot-starter:2.7.13" : "1e12e466,refs=2", - "org.springframework.boot:spring-boot-starter-actuator:2.7.13" : "1e12e466,refs=2", - "org.springframework.boot:spring-boot-starter-jetty:2.7.13" : "1e12e466,refs=2", - "org.springframework.boot:spring-boot-starter-json:2.7.13" : "1e12e466,refs=2", - "org.springframework.boot:spring-boot-starter-logging:2.7.13" : "1e12e466,refs=2", - "org.springframework.boot:spring-boot-starter-web:2.7.13" : "1e12e466,refs=2", - "org.springframework:spring-aop:5.3.28" : "1e12e466,refs=2", - "org.springframework:spring-beans:5.3.28" : "1e12e466,refs=2", - "org.springframework:spring-context:5.3.28" : "1e12e466,refs=2", - "org.springframework:spring-core:5.3.28" : "1e12e466,refs=2", - "org.springframework:spring-expression:5.3.28" : "1e12e466,refs=2", - "org.springframework:spring-jcl:5.3.28" : "1e12e466,refs=2", - "org.springframework:spring-web:5.3.28" : "1e12e466,refs=2", - "org.springframework:spring-webmvc:5.3.28" : "1e12e466,refs=2", + "org.springframework.boot:spring-boot:3.3.0" : "1e12e466,refs=2", + "org.springframework.boot:spring-boot-actuator:3.3.0" : "1e12e466,refs=2", + "org.springframework.boot:spring-boot-actuator-autoconfigure:3.3.0" : "1e12e466,refs=2", + "org.springframework.boot:spring-boot-autoconfigure:3.3.0" : "1e12e466,refs=2", + "org.springframework.boot:spring-boot-starter:3.3.0" : "1e12e466,refs=2", + "org.springframework.boot:spring-boot-starter-actuator:3.3.0" : "1e12e466,refs=2", + "org.springframework.boot:spring-boot-starter-jetty:3.3.0" : "1e12e466,refs=2", + "org.springframework.boot:spring-boot-starter-json:3.3.0" : "1e12e466,refs=2", + "org.springframework.boot:spring-boot-starter-logging:3.3.0" : "1e12e466,refs=2", + "org.springframework.boot:spring-boot-starter-web:3.3.0" : "1e12e466,refs=2", + "org.springframework:spring-aop:6.1.8" : "1e12e466,refs=2", + "org.springframework:spring-beans:6.1.8" : "1e12e466,refs=2", + "org.springframework:spring-context:6.1.8" : "1e12e466,refs=2", + "org.springframework:spring-core:6.1.8" : "1e12e466,refs=2", + "org.springframework:spring-expression:6.1.8" : "1e12e466,refs=2", + "org.springframework:spring-jcl:6.1.8" : "1e12e466,refs=2", + "org.springframework:spring-web:6.1.8" : "1e12e466,refs=2", + "org.springframework:spring-webmvc:6.1.8" : "1e12e466,refs=2", "org.tallison.xmp:xmpcore-shaded:6.1.10" : "50a667d1,refs=5", "org.tallison:isoparser:1.9.41.7" : "50a667d1,refs=5", "org.tallison:jmatio:1.5" : "50a667d1,refs=5", @@ -482,39 +499,39 @@ "org.threeten:threetenbp:1.6.9" : "784a94ea,refs=5", "org.tukaani:xz:1.9" : "50a667d1,refs=5", "org.xerial.snappy:snappy-java:1.1.10.5" : "99b82a6c,refs=82", - "org.yaml:snakeyaml:1.30" : "1e12e466,refs=2", - "software.amazon.awssdk:annotations:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:apache-client:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:arns:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:auth:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:aws-core:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:aws-query-protocol:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:aws-xml-protocol:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:bom:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:checksums:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:checksums-spi:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:crt-core:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:endpoints-spi:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:http-auth:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:http-auth-aws:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:http-auth-spi:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:http-client-spi:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:identity-spi:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:json-utils:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:metrics-spi:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:profiles:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:protocol-core:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:regions:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:retries:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:retries-spi:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:s3:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:sdk-core:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:sts:2.26.19" : "7accccef,refs=3", - "software.amazon.awssdk:third-party-jackson-core:2.26.19" : "87cc13ff,refs=5", - "software.amazon.awssdk:url-connection-client:2.26.19" : "1e12e466,refs=2", - "software.amazon.awssdk:utils:2.26.19" : "87cc13ff,refs=5", + "org.yaml:snakeyaml:2.2" : "1e12e466,refs=2", + "software.amazon.awssdk:annotations:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:apache-client:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:arns:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:auth:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:aws-core:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:aws-query-protocol:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:aws-xml-protocol:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:bom:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:checksums:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:checksums-spi:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:crt-core:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:endpoints-spi:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:http-auth:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:http-auth-aws:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:http-auth-aws-eventstream:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:http-auth-spi:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:http-client-spi:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:identity-spi:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:json-utils:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:metrics-spi:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:profiles:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:protocol-core:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:regions:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:retries:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:retries-spi:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:s3:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:sdk-core:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:sts:2.28.11" : "7accccef,refs=3", + "software.amazon.awssdk:third-party-jackson-core:2.28.11" : "87cc13ff,refs=5", + "software.amazon.awssdk:url-connection-client:2.28.11" : "1e12e466,refs=2", + "software.amazon.awssdk:utils:2.28.11" : "87cc13ff,refs=5", "software.amazon.eventstream:eventstream:1.0.1" : "87cc13ff,refs=5", - "software.amazon.ion:ion-java:1.0.2" : "1e12e466,refs=2", "ua.net.nlp:morfologik-ukrainian-search:4.9.1" : "727aea63,refs=7", "xerces:xercesImpl:2.12.2" : "50a667d1,refs=5" } @@ -7566,6 +7583,32 @@ "projectPath" : ":solr:modules:sql" } ], + "5f3bb7bb" : [ + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:server" + }, + { + "configuration" : "serverLib", + "projectPath" : ":solr:server" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solrj" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj" + }, + { + "configuration" : "serverLib", + "projectPath" : ":solr:webapp" + } + ], "5f4312f3" : [ { "configuration" : "compileClasspath", @@ -8290,6 +8333,316 @@ "projectPath" : ":solr:modules:sql" } ], + "64f07552" : [ + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:api" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:core" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:server" + }, + { + "configuration" : "solrCore", + "projectPath" : ":solr:server" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solr-ref-guide" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj-streaming" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj-zookeeper" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "solrCore", + "projectPath" : ":solr:webapp" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:sql" + } + ], "69bf1b73" : [ { "configuration" : "compileClasspath", @@ -13352,6 +13705,20 @@ "projectPath" : ":solr:solrj-streaming" } ], + "97e75301" : [ + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:extraction" + } + ], "99b82a6c" : [ { "configuration" : "testRuntimeClasspath", @@ -16678,7 +17045,7 @@ "projectPath" : ":solr:modules:sql" } ], - "dc28f153" : [ + "dc1a0633" : [ { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:api" @@ -16691,10 +17058,6 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:benchmark" }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:core" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:core" @@ -16703,18 +17066,10 @@ "configuration" : "runtimeLibs", "projectPath" : ":solr:core" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:core" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:core" }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:cross-dc-manager" @@ -16727,10 +17082,6 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:cross-dc-manager" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:cross-dc-manager" @@ -16743,10 +17094,6 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:prometheus-exporter" }, - { - "configuration" : "libExt", - "projectPath" : ":solr:server" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:server" @@ -16779,10 +17126,6 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:test-framework" }, - { - "configuration" : "serverLib", - "projectPath" : ":solr:webapp" - }, { "configuration" : "solrCore", "projectPath" : ":solr:webapp" @@ -16963,22 +17306,10 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:opentelemetry" }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:s3-repository" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:s3-repository" - }, { "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:s3-repository" }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:s3-repository" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:modules:scripting" @@ -17012,33 +17343,7 @@ "projectPath" : ":solr:modules:sql" } ], - "dd724fae" : [ - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:opentelemetry" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" - } - ], - "ddc123c8" : [ + "dc28f153" : [ { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:api" @@ -17051,6 +17356,10 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:benchmark" }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:core" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:core" @@ -17059,10 +17368,18 @@ "configuration" : "runtimeLibs", "projectPath" : ":solr:core" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:core" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:core" }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:cross-dc-manager" @@ -17075,6 +17392,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:cross-dc-manager" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:cross-dc-manager" @@ -17087,6 +17408,10 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:prometheus-exporter" }, + { + "configuration" : "libExt", + "projectPath" : ":solr:server" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:server" @@ -17119,6 +17444,10 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:test-framework" }, + { + "configuration" : "serverLib", + "projectPath" : ":solr:webapp" + }, { "configuration" : "solrCore", "projectPath" : ":solr:webapp" @@ -17171,10 +17500,6 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:cross-dc" }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:extraction" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:modules:extraction" @@ -17187,10 +17512,6 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:extraction" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:extraction" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:extraction" @@ -17255,10 +17576,6 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:jwt-auth" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:jwt-auth" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:jwt-auth" @@ -17360,34 +17677,30 @@ "projectPath" : ":solr:modules:sql" } ], - "debe9836" : [ - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:extraction" - }, + "dd724fae" : [ { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:extraction" + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:extraction" + "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:extraction" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:extraction" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:s3-repository" + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:opentelemetry" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:s3-repository" + "projectPath" : ":solr:modules:opentelemetry" } ], "e19ba4dc" : [ @@ -17740,24 +18053,6 @@ "projectPath" : ":solr:modules:sql" } ], - "e2f3f42e" : [ - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:s3-repository" - } - ], "e5b524d7" : [ { "configuration" : "annotationProcessor", From 5e1bc755ae2bd1e8d7c39bda36bae5b8f49dc0b1 Mon Sep 17 00:00:00 2001 From: Sanjay Dutt Date: Fri, 22 Nov 2024 19:09:12 +0530 Subject: [PATCH 3/8] add missing licenses --- .../jakarta.websocket-client-LICENSE-ASL.txt | 637 ++++++++++++++++++ .../jakarta.websocket-client-NOTICE.txt | 45 ++ ...NSE-ASL.txt => micrometer-LICENSE-ASL.txt} | 9 +- solr/licenses/micrometer-NOTICE.txt | 45 ++ 4 files changed, 731 insertions(+), 5 deletions(-) create mode 100644 solr/licenses/jakarta.websocket-client-LICENSE-ASL.txt create mode 100644 solr/licenses/jakarta.websocket-client-NOTICE.txt rename solr/licenses/{http2-client-LICENSE-ASL.txt => micrometer-LICENSE-ASL.txt} (98%) create mode 100644 solr/licenses/micrometer-NOTICE.txt diff --git a/solr/licenses/jakarta.websocket-client-LICENSE-ASL.txt b/solr/licenses/jakarta.websocket-client-LICENSE-ASL.txt new file mode 100644 index 00000000000..5de3d1b40c1 --- /dev/null +++ b/solr/licenses/jakarta.websocket-client-LICENSE-ASL.txt @@ -0,0 +1,637 @@ +# Eclipse Public License - v 2.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + + 1. DEFINITIONS + + "Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + + "Contributor" means any person or entity that Distributes the Program. + + "Licensed Patents" mean patent claims licensable by a Contributor which + are necessarily infringed by the use or sale of its Contribution alone + or when combined with the Program. + + "Program" means the Contributions Distributed in accordance with this + Agreement. + + "Recipient" means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + + "Derivative Works" shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + + "Modified Works" shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, + interfaces, types, classes, structures, or files of the Program solely + in each case in order to link to, bind by name, or subclass the Program + or Modified Works thereof. + + "Distribute" means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + + "Source Code" means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + + "Secondary License" means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + + 2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). + + 3. REQUIREMENTS + + 3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + + 3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + + 3.3 Contributors may not remove or alter any copyright, patent, + trademark, attribution notices, disclaimers of warranty, or limitations + of liability ("notices") contained within the Program from any copy of + the Program which they Distribute, provided that Contributors may add + their own appropriate notices. + + 4. COMMERCIAL DISTRIBUTION + + Commercial distributors of software may accept certain responsibilities + with respect to end users, business partners and the like. While this + license is intended to facilitate the commercial use of the Program, + the Contributor who includes the Program in a commercial product + offering should do so in a manner which does not create potential + liability for other Contributors. Therefore, if a Contributor includes + the Program in a commercial product offering, such Contributor + ("Commercial Contributor") hereby agrees to defend and indemnify every + other Contributor ("Indemnified Contributor") against any losses, + damages and costs (collectively "Losses") arising from claims, lawsuits + and other legal actions brought by a third party against the Indemnified + Contributor to the extent caused by the acts or omissions of such + Commercial Contributor in connection with its distribution of the Program + in a commercial product offering. The obligations in this section do not + apply to any claims or Losses relating to any actual or alleged + intellectual property infringement. In order to qualify, an Indemnified + Contributor must: a) promptly notify the Commercial Contributor in + writing of such claim, and b) allow the Commercial Contributor to control, + and cooperate with the Commercial Contributor in, the defense and any + related settlement negotiations. The Indemnified Contributor may + participate in any such claim at its own expense. + + For example, a Contributor might include the Program in a commercial + product offering, Product X. That Contributor is then a Commercial + Contributor. If that Commercial Contributor then makes performance + claims, or offers warranties related to Product X, those performance + claims and warranties are such Commercial Contributor's responsibility + alone. Under this section, the Commercial Contributor would have to + defend claims against the other Contributors related to those performance + claims and warranties, and if a court requires any other Contributor to + pay any damages as a result, the Commercial Contributor must pay + those damages. + + 5. NO WARRANTY + + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT + PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" + BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR + IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF + TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR + PURPOSE. Each Recipient is solely responsible for determining the + appropriateness of using and distributing the Program and assumes all + risks associated with its exercise of rights under this Agreement, + including but not limited to the risks and costs of program errors, + compliance with applicable laws, damage to or loss of data, programs + or equipment, and unavailability or interruption of operations. + + 6. DISCLAIMER OF LIABILITY + + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT + PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS + SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST + PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE + EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + + 7. GENERAL + + If any provision of this Agreement is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this Agreement, and without further + action by the parties hereto, such provision shall be reformed to the + minimum extent necessary to make such provision valid and enforceable. + + If Recipient institutes patent litigation against any entity + (including a cross-claim or counterclaim in a lawsuit) alleging that the + Program itself (excluding combinations of the Program with other software + or hardware) infringes such Recipient's patent(s), then such Recipient's + rights granted under Section 2(b) shall terminate as of the date such + litigation is filed. + + All Recipient's rights under this Agreement shall terminate if it + fails to comply with any of the material terms or conditions of this + Agreement and does not cure such failure in a reasonable period of + time after becoming aware of such noncompliance. If all Recipient's + rights under this Agreement terminate, Recipient agrees to cease use + and distribution of the Program as soon as reasonably practicable. + However, Recipient's obligations under this Agreement and any licenses + granted by Recipient relating to the Program shall continue and survive. + + Everyone is permitted to copy and distribute copies of this Agreement, + but in order to avoid inconsistency the Agreement is copyrighted and + may only be modified in the following manner. The Agreement Steward + reserves the right to publish new versions (including revisions) of + this Agreement from time to time. No one other than the Agreement + Steward has the right to modify this Agreement. The Eclipse Foundation + is the initial Agreement Steward. The Eclipse Foundation may assign the + responsibility to serve as the Agreement Steward to a suitable separate + entity. Each new version of the Agreement will be given a distinguishing + version number. The Program (including Contributions) may always be + Distributed subject to the version of the Agreement under which it was + received. In addition, after a new version of the Agreement is published, + Contributor may elect to Distribute the Program (including its + Contributions) under the new version. + + Except as expressly stated in Sections 2(a) and 2(b) above, Recipient + receives no rights or licenses to the intellectual property of any + Contributor under this Agreement, whether expressly, by implication, + estoppel or otherwise. All rights in the Program not expressly granted + under this Agreement are reserved. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + + Exhibit A - Form of Secondary Licenses Notice + + "This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership. + +--- + +## The GNU General Public License (GPL) Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor + Boston, MA 02110-1335 + USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your freedom to + share and change it. By contrast, the GNU General Public License is + intended to guarantee your freedom to share and change free software--to + make sure the software is free for all its users. This General Public + License applies to most of the Free Software Foundation's software and + to any other program whose authors commit to using it. (Some other Free + Software Foundation software is covered by the GNU Library General + Public License instead.) You can apply it to your programs, too. + + When we speak of free software, we are referring to freedom, not price. + Our General Public Licenses are designed to make sure that you have the + freedom to distribute copies of free software (and charge for this + service if you wish), that you receive source code or can get it if you + want it, that you can change the software or use pieces of it in new + free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid anyone + to deny you these rights or to ask you to surrender the rights. These + restrictions translate to certain responsibilities for you if you + distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether gratis + or for a fee, you must give the recipients all the rights that you have. + You must make sure that they, too, receive or can get the source code. + And you must show them these terms so they know their rights. + + We protect your rights with two steps: (1) copyright the software, and + (2) offer you this license which gives you legal permission to copy, + distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain + that everyone understands that there is no warranty for this free + software. If the software is modified by someone else and passed on, we + want its recipients to know that what they have is not the original, so + that any problems introduced by others will not reflect on the original + authors' reputations. + + Finally, any free program is threatened constantly by software patents. + We wish to avoid the danger that redistributors of a free program will + individually obtain patent licenses, in effect making the program + proprietary. To prevent this, we have made it clear that any patent must + be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and + modification follow. + + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains a + notice placed by the copyright holder saying it may be distributed under + the terms of this General Public License. The "Program", below, refers + to any such program or work, and a "work based on the Program" means + either the Program or any derivative work under copyright law: that is + to say, a work containing the Program or a portion of it, either + verbatim or with modifications and/or translated into another language. + (Hereinafter, translation is included without limitation in the term + "modification".) Each licensee is addressed as "you". + + Activities other than copying, distribution and modification are not + covered by this License; they are outside its scope. The act of running + the Program is not restricted, and the output from the Program is + covered only if its contents constitute a work based on the Program + (independent of having been made by running the Program). Whether that + is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's source + code as you receive it, in any medium, provided that you conspicuously + and appropriately publish on each copy an appropriate copyright notice + and disclaimer of warranty; keep intact all the notices that refer to + this License and to the absence of any warranty; and give any other + recipients of the Program a copy of this License along with the Program. + + You may charge a fee for the physical act of transferring a copy, and + you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion of + it, thus forming a work based on the Program, and copy and distribute + such modifications or work under the terms of Section 1 above, provided + that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any part + thereof, to be licensed as a whole at no charge to all third parties + under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a notice + that there is no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program under these + conditions, and telling the user how to view a copy of this License. + (Exception: if the Program itself is interactive but does not + normally print such an announcement, your work based on the Program + is not required to print an announcement.) + + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, and + can be reasonably considered independent and separate works in + themselves, then this License, and its terms, do not apply to those + sections when you distribute them as separate works. But when you + distribute the same sections as part of a whole which is a work based on + the Program, the distribution of the whole must be on the terms of this + License, whose permissions for other licensees extend to the entire + whole, and thus to each and every part regardless of who wrote it. + + Thus, it is not the intent of this section to claim rights or contest + your rights to work written entirely by you; rather, the intent is to + exercise the right to control the distribution of derivative or + collective works based on the Program. + + In addition, mere aggregation of another work not based on the Program + with the Program (or with a work based on the Program) on a volume of a + storage or distribution medium does not bring the other work under the + scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, + under Section 2) in object code or executable form under the terms of + Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your cost + of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed + only for noncommercial distribution and only if you received the + program in object code or executable form with such an offer, in + accord with Subsection b above.) + + The source code for a work means the preferred form of the work for + making modifications to it. For an executable work, complete source code + means all the source code for all modules it contains, plus any + associated interface definition files, plus the scripts used to control + compilation and installation of the executable. However, as a special + exception, the source code distributed need not include anything that is + normally distributed (in either source or binary form) with the major + components (compiler, kernel, and so on) of the operating system on + which the executable runs, unless that component itself accompanies the + executable. + + If distribution of executable or object code is made by offering access + to copy from a designated place, then offering equivalent access to copy + the source code from the same place counts as distribution of the source + code, even though third parties are not compelled to copy the source + along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt otherwise + to copy, modify, sublicense or distribute the Program is void, and will + automatically terminate your rights under this License. However, parties + who have received copies, or rights, from you under this License will + not have their licenses terminated so long as such parties remain in + full compliance. + + 5. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify or + distribute the Program or its derivative works. These actions are + prohibited by law if you do not accept this License. Therefore, by + modifying or distributing the Program (or any work based on the + Program), you indicate your acceptance of this License to do so, and all + its terms and conditions for copying, distributing or modifying the + Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the + Program), the recipient automatically receives a license from the + original licensor to copy, distribute or modify the Program subject to + these terms and conditions. You may not impose any further restrictions + on the recipients' exercise of the rights granted herein. You are not + responsible for enforcing compliance by third parties to this License. + + 7. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent issues), + conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot distribute + so as to satisfy simultaneously your obligations under this License and + any other pertinent obligations, then as a consequence you may not + distribute the Program at all. For example, if a patent license would + not permit royalty-free redistribution of the Program by all those who + receive copies directly or indirectly through you, then the only way you + could satisfy both it and this License would be to refrain entirely from + distribution of the Program. + + If any portion of this section is held invalid or unenforceable under + any particular circumstance, the balance of the section is intended to + apply and the section as a whole is intended to apply in other + circumstances. + + It is not the purpose of this section to induce you to infringe any + patents or other property right claims or to contest validity of any + such claims; this section has the sole purpose of protecting the + integrity of the free software distribution system, which is implemented + by public license practices. Many people have made generous + contributions to the wide range of software distributed through that + system in reliance on consistent application of that system; it is up to + the author/donor to decide if he or she is willing to distribute + software through any other system and a licensee cannot impose that choice. + + This section is intended to make thoroughly clear what is believed to be + a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License may + add an explicit geographical distribution limitation excluding those + countries, so that distribution is permitted only in or among countries + not thus excluded. In such case, this License incorporates the + limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new + versions of the General Public License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the Program + specifies a version number of this License which applies to it and "any + later version", you have the option of following the terms and + conditions either of that version or of any later version published by + the Free Software Foundation. If the Program does not specify a version + number of this License, you may choose any version ever published by the + Free Software Foundation. + + 10. If you wish to incorporate parts of the Program into other free + programs whose distribution conditions are different, write to the + author to ask for permission. For software which is copyrighted by the + Free Software Foundation, write to the Free Software Foundation; we + sometimes make exceptions for this. Our decision will be guided by the + two goals of preserving the free status of all derivatives of our free + software and of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. + EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR + OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, + EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE + ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH + YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL + NECESSARY SERVICING, REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY + AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR + DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL + DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM + (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED + INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF + THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR + OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it + free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest to + attach them to the start of each source file to most effectively convey + the exclusion of warranty; and each file should have at least the + "copyright" line and a pointer to where the full notice is found. + + One line to give the program's name and a brief idea of what it does. + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type + `show w'. This is free software, and you are welcome to redistribute + it under certain conditions; type `show c' for details. + + The hypothetical commands `show w' and `show c' should show the + appropriate parts of the General Public License. Of course, the commands + you use may be called something other than `show w' and `show c'; they + could even be mouse-clicks or menu items--whatever suits your program. + + You should also get your employer (if you work as a programmer) or your + school, if any, to sign a "copyright disclaimer" for the program, if + necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (which makes passes at compilers) written by + James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + + This General Public License does not permit incorporating your program + into proprietary programs. If your program is a subroutine library, you + may consider it more useful to permit linking proprietary applications + with the library. If this is what you want to do, use the GNU Library + General Public License instead of this License. + +--- + +## CLASSPATH EXCEPTION + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License version 2 cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from or + based on this library. If you modify this library, you may extend this + exception to your version of the library, but you are not obligated to + do so. If you do not wish to do so, delete this exception statement + from your version. diff --git a/solr/licenses/jakarta.websocket-client-NOTICE.txt b/solr/licenses/jakarta.websocket-client-NOTICE.txt new file mode 100644 index 00000000000..076c3641fa4 --- /dev/null +++ b/solr/licenses/jakarta.websocket-client-NOTICE.txt @@ -0,0 +1,45 @@ +Micrometer + +Copyright (c) 2017-Present VMware, Inc. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +------------------------------------------------------------------------------- + +This product contains a modified portion of 'io.netty.util.internal.logging', +in the Netty/Common library distributed by The Netty Project: + + * Copyright 2013 The Netty Project + * License: Apache License v2.0 + * Homepage: https://netty.io + +This product contains a modified portion of 'StringUtils.isBlank()', +in the Commons Lang library distributed by The Apache Software Foundation: + + * Copyright 2001-2019 The Apache Software Foundation + * License: Apache License v2.0 + * Homepage: https://commons.apache.org/proper/commons-lang/ + +This product contains a modified portion of 'JsonUtf8Writer', +in the Moshi library distributed by Square, Inc: + + * Copyright 2010 Google Inc. + * License: Apache License v2.0 + * Homepage: https://github.com/square/moshi + +This product contains a modified portion of the 'org.springframework.lang' +package in the Spring Framework library, distributed by VMware, Inc: + + * Copyright 2002-2019 the original author or authors. + * License: Apache License v2.0 + * Homepage: https://spring.io/projects/spring-framework diff --git a/solr/licenses/http2-client-LICENSE-ASL.txt b/solr/licenses/micrometer-LICENSE-ASL.txt similarity index 98% rename from solr/licenses/http2-client-LICENSE-ASL.txt rename to solr/licenses/micrometer-LICENSE-ASL.txt index d6456956733..9b259bdfcf9 100644 --- a/solr/licenses/http2-client-LICENSE-ASL.txt +++ b/solr/licenses/micrometer-LICENSE-ASL.txt @@ -1,7 +1,6 @@ - Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -179,7 +178,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" + boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -187,13 +186,13 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright {yyyy} {name of copyright owner} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/solr/licenses/micrometer-NOTICE.txt b/solr/licenses/micrometer-NOTICE.txt new file mode 100644 index 00000000000..076c3641fa4 --- /dev/null +++ b/solr/licenses/micrometer-NOTICE.txt @@ -0,0 +1,45 @@ +Micrometer + +Copyright (c) 2017-Present VMware, Inc. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +------------------------------------------------------------------------------- + +This product contains a modified portion of 'io.netty.util.internal.logging', +in the Netty/Common library distributed by The Netty Project: + + * Copyright 2013 The Netty Project + * License: Apache License v2.0 + * Homepage: https://netty.io + +This product contains a modified portion of 'StringUtils.isBlank()', +in the Commons Lang library distributed by The Apache Software Foundation: + + * Copyright 2001-2019 The Apache Software Foundation + * License: Apache License v2.0 + * Homepage: https://commons.apache.org/proper/commons-lang/ + +This product contains a modified portion of 'JsonUtf8Writer', +in the Moshi library distributed by Square, Inc: + + * Copyright 2010 Google Inc. + * License: Apache License v2.0 + * Homepage: https://github.com/square/moshi + +This product contains a modified portion of the 'org.springframework.lang' +package in the Spring Framework library, distributed by VMware, Inc: + + * Copyright 2002-2019 the original author or authors. + * License: Apache License v2.0 + * Homepage: https://spring.io/projects/spring-framework From dbc0a08fe90f6acf68e16d4bfe3c84f51064a8da Mon Sep 17 00:00:00 2001 From: Sanjay Dutt Date: Fri, 22 Nov 2024 21:30:12 +0530 Subject: [PATCH 4/8] adding permissions to solr test policy --- gradle/testing/randomization/policies/solr-tests.policy | 7 +++++++ .../src/java/org/apache/solr/util/SSLTestConfig.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policy index aeee28026b0..f7d439e64df 100644 --- a/gradle/testing/randomization/policies/solr-tests.policy +++ b/gradle/testing/randomization/policies/solr-tests.policy @@ -253,8 +253,15 @@ grant { permission java.io.FilePermission "${aws.configFile}", "read,readlink"; permission java.io.FilePermission "${user.home}${/}.aws${/}-", "read,readlink"; + // GCS + permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}properties", "read,readlink"; + permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}active_config", "read,readlink"; + permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}configurations${/}config_default", "read,readlink"; + + // expanded to a wildcard if set, allows all networking everywhere permission java.net.SocketPermission "${solr.internal.network.permission}", "accept,listen,connect,resolve"; + permission java.net.SocketPermission "metadata.google.internal:80", "connect,resolve"; // Run java permission java.io.FilePermission "${java.home}${/}-", "execute"; diff --git a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java index a77a2ff5bdb..36d7328d973 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java +++ b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java @@ -116,7 +116,7 @@ public SSLTestConfig(boolean useSsl, boolean clientAuth, boolean checkPeerName) final String resourceName = checkPeerName ? TEST_KEYSTORE_LOCALHOST_RESOURCE : TEST_KEYSTORE_BOGUSHOST_RESOURCE; - trustStore = keyStore = ResourceFactory.root().newSystemResource(resourceName); + trustStore = keyStore = ResourceFactory.root().newClassLoaderResource(resourceName, true); if (null == keyStore || !keyStore.exists()) { throw new IllegalStateException( "Unable to locate keystore resource file in classpath: " + resourceName); From a1e67bc81fea556780b54d84a5a0f402f682fd45 Mon Sep 17 00:00:00 2001 From: Sanjay Dutt Date: Mon, 25 Nov 2024 11:33:15 +0530 Subject: [PATCH 5/8] Fix TestHttpServletRequestGetter --- .../tracing/TestHttpServletRequestGetter.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java index 9b07a29755d..1389f2f2bf5 100644 --- a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java +++ b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java @@ -17,6 +17,8 @@ package org.apache.solr.util.tracing; +import static org.mockito.Mockito.mock; + import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; @@ -26,10 +28,16 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import org.apache.solr.SolrTestCase; +import org.apache.solr.SolrTestCaseJ4; +import org.junit.Before; import org.junit.Test; -public class TestHttpServletRequestGetter extends SolrTestCase { +public class TestHttpServletRequestGetter extends SolrTestCaseJ4 { + @Before + public void setUp() throws Exception { + super.setUp(); + assumeWorkingMockito(); + } @Test public void test() { @@ -39,8 +47,9 @@ public void test() { "b", Set.of("1"), "c", Set.of("2")); + HttpServletRequest httpServletRequestMock = mock(HttpServletRequest.class); HttpServletRequest req = - new HttpServletRequestWrapper(null) { + new HttpServletRequestWrapper(httpServletRequestMock) { @Override public String getHeader(String name) { From d3594a4bb270f3d79508deaa068fa8ea3ee99271 Mon Sep 17 00:00:00 2001 From: Sanjay Dutt Date: Mon, 25 Nov 2024 11:40:28 +0530 Subject: [PATCH 6/8] tidy --- .../apache/solr/util/tracing/TestHttpServletRequestGetter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java index 1389f2f2bf5..2cee435eec3 100644 --- a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java +++ b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java @@ -33,6 +33,8 @@ import org.junit.Test; public class TestHttpServletRequestGetter extends SolrTestCaseJ4 { + + @Override @Before public void setUp() throws Exception { super.setUp(); From 7bd72593b66ba8e3d7da2d8765f9fb19e2589ff5 Mon Sep 17 00:00:00 2001 From: Sanjay Dutt Date: Mon, 25 Nov 2024 22:41:38 +0530 Subject: [PATCH 7/8] jetty xml changes --- gradle/libs.versions.toml | 9 +++--- solr/core/build.gradle | 2 +- solr/cross-dc-manager/build.gradle | 2 +- solr/modules/s3-repository/build.gradle | 1 - solr/server/build.gradle | 9 +++--- solr/server/contexts/solr-jetty-context.xml | 4 +-- solr/server/etc/jetty.xml | 32 ++++++++++----------- solr/server/etc/webdefault.xml | 6 ++-- solr/solrj/build.gradle | 4 +-- solr/test-framework/build.gradle | 4 +-- 10 files changed, 37 insertions(+), 36 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5a915682edf..45ed82eab19 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -306,7 +306,8 @@ commonsio-commonsio = { module = "commons-io:commons-io", version.ref = "commons cybozulabs-langdetect = { module = "com.cybozu.labs:langdetect", version.ref = "cybozulabs-langdetect" } dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizard-metrics" } dropwizard-metrics-graphite = { module = "io.dropwizard.metrics:metrics-graphite", version.ref = "dropwizard-metrics" } -dropwizard-metrics-jetty10 = { module = "io.dropwizard.metrics:metrics-jetty12-ee10", version.ref = "dropwizard-metrics" } +dropwizard-metrics-jetty12 = { module = "io.dropwizard.metrics:metrics-jetty12", version.ref = "dropwizard-metrics" } +dropwizard-metrics-jetty12-ee10 = { module = "io.dropwizard.metrics:metrics-jetty12-ee10", version.ref = "dropwizard-metrics" } dropwizard-metrics-jmx = { module = "io.dropwizard.metrics:metrics-jmx", version.ref = "dropwizard-metrics" } dropwizard-metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version.ref = "dropwizard-metrics" } dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-servlets", version.ref = "dropwizard-metrics" } @@ -319,6 +320,9 @@ eclipse-jetty-deploy = { module = "org.eclipse.jetty:jetty-deploy", version.ref eclipse-jetty-ee = { module = "org.eclipse.jetty:jetty-ee", version.ref = "eclipse-jetty" } eclipse-jetty-ee10-webapp = { module = "org.eclipse.jetty.ee10:jetty-ee10-webapp", version.ref = "eclipse-jetty" } eclipse-jetty-ee8-nested = { module = "org.eclipse.jetty.ee8:jetty-ee8-nested", version.ref = "eclipse-jetty" } +eclipse-jetty-ee8-servlet = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlet", version.ref = "eclipse-jetty" } +eclipse-jetty-ee8-servlets = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlets", version.ref = "eclipse-jetty" } +eclipse-jetty-ee8-webapp = { module = "org.eclipse.jetty.ee8:jetty-ee8-webapp", version.ref = "eclipse-jetty" } eclipse-jetty-http = { module = "org.eclipse.jetty:jetty-http", version.ref = "eclipse-jetty" } eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:jetty-http2-client", version.ref = "eclipse-jetty" } eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:jetty-http2-common", version.ref = "eclipse-jetty" } @@ -332,13 +336,10 @@ eclipse-jetty-plus = { module = "org.eclipse.jetty:jetty-plus", version.ref = "e eclipse-jetty-rewrite = { module = "org.eclipse.jetty:jetty-rewrite", version.ref = "eclipse-jetty" } eclipse-jetty-security = { module = "org.eclipse.jetty:jetty-security", version.ref = "eclipse-jetty" } eclipse-jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "eclipse-jetty" } -eclipse-jetty-servlet = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlet", version.ref = "eclipse-jetty" } -eclipse-jetty-servlets = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlets", version.ref = "eclipse-jetty" } eclipse-jetty-session = { module = "org.eclipse.jetty:jetty-session", version.ref = "eclipse-jetty" } eclipse-jetty-start = { module = "org.eclipse.jetty:jetty-start", version.ref = "eclipse-jetty" } eclipse-jetty-toolchain-servletapi = { module = "org.eclipse.jetty.toolchain:jetty-servlet-api", version.ref = "eclipse-jettytoolchain" } eclipse-jetty-util = { module = "org.eclipse.jetty:jetty-util", version.ref = "eclipse-jetty" } -eclipse-jetty-webapp = { module = "org.eclipse.jetty.ee8:jetty-ee8-webapp", version.ref = "eclipse-jetty" } eclipse-jetty-xml = { module = "org.eclipse.jetty:jetty-xml", version.ref = "eclipse-jetty" } eclipse-jgit-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit" } fasterxml-jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "fasterxml" } diff --git a/solr/core/build.gradle b/solr/core/build.gradle index 36dd3cbf507..77b2b399775 100644 --- a/solr/core/build.gradle +++ b/solr/core/build.gradle @@ -194,7 +194,7 @@ dependencies { testImplementation libs.apache.lucene.testframework testImplementation libs.eclipse.jetty.server - testImplementation libs.eclipse.jetty.servlet + testImplementation libs.eclipse.jetty.ee8.servlet testImplementation libs.eclipse.jetty.util testImplementation libs.carrotsearch.randomizedtesting.runner diff --git a/solr/cross-dc-manager/build.gradle b/solr/cross-dc-manager/build.gradle index 1cf2b575b65..2c7c08c43b7 100644 --- a/solr/cross-dc-manager/build.gradle +++ b/solr/cross-dc-manager/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation libs.dropwizard.metrics.core implementation libs.dropwizard.metrics.servlets implementation libs.eclipse.jetty.server - implementation libs.eclipse.jetty.servlet + implementation libs.eclipse.jetty.ee8.servlet implementation libs.slf4j.api runtimeOnly libs.google.protobuf.javautils runtimeOnly libs.commonscodec.commonscodec diff --git a/solr/modules/s3-repository/build.gradle b/solr/modules/s3-repository/build.gradle index f4d48f55205..0b5b6bb2fff 100644 --- a/solr/modules/s3-repository/build.gradle +++ b/solr/modules/s3-repository/build.gradle @@ -96,7 +96,6 @@ dependencies { testImplementation libs.commonsio.commonsio - //testRuntimeOnly libs.eclipse.jetty.webapp testRuntimeOnly(libs.eclipse.jetty.ee10.webapp) { exclude group: 'org.ow2.asm', module: '*' } diff --git a/solr/server/build.gradle b/solr/server/build.gradle index 870d582e985..86d7a72df71 100644 --- a/solr/server/build.gradle +++ b/solr/server/build.gradle @@ -46,10 +46,10 @@ dependencies { serverLib libs.eclipse.jetty.rewrite serverLib libs.eclipse.jetty.security serverLib libs.eclipse.jetty.server - serverLib libs.eclipse.jetty.servlet - serverLib libs.eclipse.jetty.servlets + serverLib libs.eclipse.jetty.ee8.servlet + serverLib libs.eclipse.jetty.ee8.servlets serverLib libs.eclipse.jetty.util - serverLib libs.eclipse.jetty.webapp + serverLib libs.eclipse.jetty.ee8.webapp serverLib libs.eclipse.jetty.xml serverLib libs.eclipse.jetty.alpnserver serverLib(libs.eclipse.jetty.alpnjavaserver, { @@ -80,7 +80,7 @@ dependencies { libExt(libs.dropwizard.metrics.graphite, { exclude group: "com.rabbitmq", module: "amqp-client" }) - libExt(libs.dropwizard.metrics.jetty10, { + libExt(libs.dropwizard.metrics.jetty12, { exclude group: "org.eclipse.jetty", module: "*" exclude group: "org.eclipse.jetty.http2", module: "*" exclude group: "org.eclipse.jetty.toolchain", module: "*" @@ -88,6 +88,7 @@ dependencies { }) libExt libs.dropwizard.metrics.jvm libExt libs.dropwizard.metrics.jmx + libExt libs.dropwizard.metrics.jetty12.ee10 webapp project(path: ":solr:webapp", configuration: "war") diff --git a/solr/server/contexts/solr-jetty-context.xml b/solr/server/contexts/solr-jetty-context.xml index ec646738c3b..0e4500c2700 100644 --- a/solr/server/contexts/solr-jetty-context.xml +++ b/solr/server/contexts/solr-jetty-context.xml @@ -1,6 +1,6 @@ - + /solr-webapp/webapp /etc/webdefault.xml @@ -26,7 +26,7 @@ true - + -org.eclipse.jetty. diff --git a/solr/server/etc/jetty.xml b/solr/server/etc/jetty.xml index 282de87536f..117218b9d88 100644 --- a/solr/server/etc/jetty.xml +++ b/solr/server/etc/jetty.xml @@ -29,8 +29,8 @@ - - + + solr.jetty @@ -88,8 +88,6 @@ - true - false requestedPath @@ -97,8 +95,8 @@ /solr/* - Content-Security-Policy - default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self'; worker-src 'self'; + Content-Security-Policy + default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self'; worker-src 'self'; @@ -106,8 +104,8 @@ /solr/* - X-Content-Type-Options - nosniff + X-Content-Type-Options + nosniff @@ -115,8 +113,8 @@ /solr/* - X-Frame-Options - SAMEORIGIN + X-Frame-Options + SAMEORIGIN @@ -124,8 +122,8 @@ /solr/* - X-XSS-Protection - 1; mode=block + X-XSS-Protection + 1; mode=block @@ -156,7 +154,7 @@ - + @@ -181,7 +179,7 @@ - + @@ -214,14 +212,16 @@ + - + + core /contexts 0 diff --git a/solr/server/etc/webdefault.xml b/solr/server/etc/webdefault.xml index f0882926a90..563cac8ba80 100644 --- a/solr/server/etc/webdefault.xml +++ b/solr/server/etc/webdefault.xml @@ -35,7 +35,7 @@ - org.eclipse.jetty.servlet.listener.ELContextCleaner + org.eclipse.jetty.ee8.servlet.listener.ELContextCleaner @@ -43,7 +43,7 @@ - org.eclipse.jetty.servlet.listener.IntrospectorCleaner + org.eclipse.jetty.ee8.servlet.listener.IntrospectorCleaner @@ -116,7 +116,7 @@ default - org.eclipse.jetty.servlet.DefaultServlet + org.eclipse.jetty.ee8.servlet.DefaultServlet aliases false diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle index 2d092cf35fc..8640c3c5232 100644 --- a/solr/solrj/build.gradle +++ b/solr/solrj/build.gradle @@ -76,8 +76,8 @@ dependencies { testImplementation libs.eclipse.jetty.toolchain.servletapi testImplementation libs.eclipse.jetty.server - testImplementation libs.eclipse.jetty.servlet - testImplementation libs.eclipse.jetty.webapp + testImplementation libs.eclipse.jetty.ee8.servlet + testImplementation libs.eclipse.jetty.ee8.webapp testRuntimeOnly(libs.eclipse.jetty.alpnjavaserver, { exclude group: "org.eclipse.jetty.alpn", module: "alpn-api" }) diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle index 6d92afd74e4..1c8b3310c42 100644 --- a/solr/test-framework/build.gradle +++ b/solr/test-framework/build.gradle @@ -65,7 +65,7 @@ dependencies { implementation libs.apache.log4j.api implementation libs.apache.log4j.core implementation libs.dropwizard.metrics.core - implementation (libs.dropwizard.metrics.jetty10){ + implementation (libs.dropwizard.metrics.jetty12.ee10){ exclude group: 'jakarta.servlet', module: 'jakarta.servlet-api' } implementation libs.commonscli.commonscli @@ -78,7 +78,7 @@ dependencies { implementation libs.eclipse.jetty.server implementation libs.eclipse.jetty.ee8.nested implementation libs.eclipse.jetty.session - api libs.eclipse.jetty.servlet + api libs.eclipse.jetty.ee8.servlet implementation libs.eclipse.jetty.util implementation libs.eclipse.jetty.alpnserver runtimeOnly(libs.eclipse.jetty.alpnjavaserver, { From 31e58a1e7a8ea617e235131d1aac8eb56b5a8b53 Mon Sep 17 00:00:00 2001 From: Sanjay Dutt Date: Mon, 25 Nov 2024 22:47:47 +0530 Subject: [PATCH 8/8] versions.lock updated --- versions.lock | 3332 +++++++++++++++++++++++++++++++------------------ 1 file changed, 2125 insertions(+), 1207 deletions(-) diff --git a/versions.lock b/versions.lock index 770538bb64b..d7701386b1b 100644 --- a/versions.lock +++ b/versions.lock @@ -209,7 +209,7 @@ "jakarta.activation:jakarta.activation-api:1.2.2" : "50a667d1,refs=5", "jakarta.annotation:jakarta.annotation-api:2.1.1" : "78dd58c9,refs=80", "jakarta.inject:jakarta.inject-api:2.0.1" : "ad8f08d7,refs=79", - "jakarta.servlet:jakarta.servlet-api:6.0.0" : "1e12e466,refs=2", + "jakarta.servlet:jakarta.servlet-api:6.0.0" : "e2aa299c,refs=21", "jakarta.validation:jakarta.validation-api:3.0.2" : "ad8f08d7,refs=79", "jakarta.websocket:jakarta.websocket-api:2.1.1" : "1e12e466,refs=2", "jakarta.websocket:jakarta.websocket-client-api:2.1.1" : "1e12e466,refs=2", @@ -396,16 +396,16 @@ "org.eclipse.jetty:jetty-client:12.0.10" : "7f2dd9d5,refs=90", "org.eclipse.jetty:jetty-deploy:12.0.10" : "24396a00,refs=4", "org.eclipse.jetty:jetty-ee:12.0.10" : "062c26b4,refs=7", - "org.eclipse.jetty:jetty-http:12.0.10" : "84afbb60,refs=130", - "org.eclipse.jetty:jetty-io:12.0.10" : "84afbb60,refs=130", + "org.eclipse.jetty:jetty-http:12.0.10" : "b327e1dd,refs=131", + "org.eclipse.jetty:jetty-io:12.0.10" : "b327e1dd,refs=131", "org.eclipse.jetty:jetty-jmx:12.0.10" : "24396a00,refs=4", "org.eclipse.jetty:jetty-jndi:12.0.10" : "7df0e72e,refs=1", "org.eclipse.jetty:jetty-plus:12.0.10" : "7df0e72e,refs=1", "org.eclipse.jetty:jetty-rewrite:12.0.10" : "5967e690,refs=32", - "org.eclipse.jetty:jetty-security:12.0.10" : "0e779887,refs=59", - "org.eclipse.jetty:jetty-server:12.0.10" : "d008b72a,refs=107", - "org.eclipse.jetty:jetty-session:12.0.10" : "0e779887,refs=59", - "org.eclipse.jetty:jetty-util:12.0.10" : "84afbb60,refs=130", + "org.eclipse.jetty:jetty-security:12.0.10" : "897bb4eb,refs=75", + "org.eclipse.jetty:jetty-server:12.0.10" : "954f156d,refs=108", + "org.eclipse.jetty:jetty-session:12.0.10" : "897bb4eb,refs=75", + "org.eclipse.jetty:jetty-util:12.0.10" : "b327e1dd,refs=131", "org.eclipse.jetty:jetty-xml:12.0.10" : "062c26b4,refs=7", "org.freemarker:freemarker:2.3.32" : "c77c5ec7,refs=1", "org.gagravarr:vorbis-java-core:0.8" : "50a667d1,refs=5", @@ -13247,30 +13247,30 @@ "projectPath" : ":solr:modules:sql" } ], - "8b517977" : [ + "897bb4eb" : [ { - "configuration" : "testRuntimeClasspath", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:api" }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:benchmark" - }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:benchmark" + "projectPath" : ":solr:api" }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:benchmark" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:benchmark" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:core" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:benchmark" }, { "configuration" : "testCompileClasspath", @@ -13280,6 +13280,10 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:core" }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:cross-dc-manager" @@ -13292,6 +13296,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:cross-dc-manager" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:cross-dc-manager" @@ -13300,18 +13308,30 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:prometheus-exporter" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:prometheus-exporter" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:prometheus-exporter" }, + { + "configuration" : "libExt", + "projectPath" : ":solr:server" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:server" }, { - "configuration" : "solrCore", + "configuration" : "serverLib", "projectPath" : ":solr:server" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solr-ref-guide" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:solr-ref-guide" @@ -13324,52 +13344,60 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:solrj" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solrj-streaming" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:solrj-streaming" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solrj-zookeeper" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:solrj-zookeeper" }, { - "configuration" : "runtimeClasspath", + "configuration" : "compileClasspath", "projectPath" : ":solr:test-framework" }, { - "configuration" : "testRuntimeClasspath", + "configuration" : "runtimeClasspath", "projectPath" : ":solr:test-framework" }, { - "configuration" : "solrCore", - "projectPath" : ":solr:webapp" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:test-framework" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:test-framework" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "serverLib", + "projectPath" : ":solr:webapp" }, { "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:analysis-extras" }, { - "configuration" : "testRuntimeClasspath", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:analysis-extras" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:clustering" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:analysis-extras" }, { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:clustering" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:clustering" }, { @@ -13377,15 +13405,11 @@ "projectPath" : ":solr:modules:clustering" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:cross-dc" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:cross-dc" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:cross-dc" }, { @@ -13393,15 +13417,11 @@ "projectPath" : ":solr:modules:cross-dc" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:extraction" }, { @@ -13409,15 +13429,11 @@ "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:gcs-repository" }, { @@ -13425,15 +13441,11 @@ "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:hadoop-auth" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:hadoop-auth" }, { @@ -13441,15 +13453,11 @@ "projectPath" : ":solr:modules:hadoop-auth" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:hdfs" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:hdfs" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:hdfs" }, { @@ -13457,15 +13465,11 @@ "projectPath" : ":solr:modules:hdfs" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:jwt-auth" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:jwt-auth" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:jwt-auth" }, { @@ -13473,15 +13477,11 @@ "projectPath" : ":solr:modules:jwt-auth" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:langid" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:langid" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:langid" }, { @@ -13489,15 +13489,11 @@ "projectPath" : ":solr:modules:langid" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:ltr" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:ltr" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:ltr" }, { @@ -13505,29 +13501,17 @@ "projectPath" : ":solr:modules:ltr" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:opentelemetry" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:opentelemetry" }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:opentelemetry" }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:s3-repository" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:s3-repository" - }, { "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:s3-repository" @@ -13541,15 +13525,11 @@ "projectPath" : ":solr:modules:s3-repository" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:scripting" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:scripting" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:scripting" }, { @@ -13557,15 +13537,11 @@ "projectPath" : ":solr:modules:scripting" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:sql" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:sql" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:sql" }, { @@ -13573,216 +13549,78 @@ "projectPath" : ":solr:modules:sql" } ], - "8ba2f0f7" : [ + "8b517977" : [ { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:extraction" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:api" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:extraction" + "projectPath" : ":solr:benchmark" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:jwt-auth" - } - ], - "8d0cef4c" : [ - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solrj-streaming" + "projectPath" : ":solr:benchmark" }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:extraction" + "projectPath" : ":solr:core" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:extraction" + "projectPath" : ":solr:core" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:extraction" + "projectPath" : ":solr:core" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:extraction" + "projectPath" : ":solr:core" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:sql" + "projectPath" : ":solr:core" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:sql" + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:sql" + "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:sql" + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:sql" - } - ], - "90aa62e6" : [ + "projectPath" : ":solr:cross-dc-manager" + }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:hdfs" + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:prometheus-exporter" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hdfs" - } - ], - "934e1fc5" : [ + "projectPath" : ":solr:prometheus-exporter" + }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:server" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:cross-dc-manager" + "configuration" : "solrCore", + "projectPath" : ":solr:server" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solr-ref-guide" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:cross-dc-manager" - } - ], - "93acde90" : [ - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solrj-streaming" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:sql" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:sql" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:sql" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:sql" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:sql" - } - ], - "970f2ee7" : [ - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solrj-streaming" - } - ], - "97e75301" : [ - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:extraction" - } - ], - "99b82a6c" : [ - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:api" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:benchmark" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:benchmark" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:core" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:core" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:core" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:core" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:prometheus-exporter" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:prometheus-exporter" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:server" - }, - { - "configuration" : "solrCore", - "projectPath" : ":solr:server" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solr-ref-guide" + "projectPath" : ":solr:solrj" }, { "configuration" : "testRuntimeClasspath", @@ -13796,18 +13634,10 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:solrj-zookeeper" }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:test-framework" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:test-framework" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:test-framework" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:test-framework" @@ -13912,10 +13742,6 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:hadoop-auth" }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:hdfs" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:modules:hdfs" @@ -13928,10 +13754,6 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:hdfs" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:hdfs" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:hdfs" @@ -14012,6 +13834,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:s3-repository" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:s3-repository" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:s3-repository" @@ -14049,103 +13875,89 @@ "projectPath" : ":solr:modules:sql" } ], - "9bcc8206" : [ - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, + "8ba2f0f7" : [ { "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:jwt-auth" + "projectPath" : ":solr:modules:extraction" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:jwt-auth" + "projectPath" : ":solr:modules:extraction" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:jwt-auth" + "projectPath" : ":solr:modules:extraction" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:jwt-auth" + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:extraction" }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:jwt-auth" } ], - "9e97e18c" : [ - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:core" - }, + "8d0cef4c" : [ { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:solrj-streaming" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solrj" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:cross-dc" + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:extraction" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:jwt-auth" + "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:ltr" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:sql" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:s3-repository" - } - ], - "a05ffa28" : [ - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:api" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:sql" }, { - "configuration" : "compileClasspath", - "projectPath" : ":solr:benchmark" + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:sql" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:benchmark" + "projectPath" : ":solr:modules:sql" }, { - "configuration" : "compileClasspath", - "projectPath" : ":solr:core" - }, + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:sql" + } + ], + "90aa62e6" : [ { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:modules:hdfs" }, { - "configuration" : "compileClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hdfs" + } + ], + "934e1fc5" : [ { "configuration" : "runtimeClasspath", "projectPath" : ":solr:cross-dc-manager" @@ -14161,245 +13973,83 @@ { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:cross-dc-manager" + } + ], + "93acde90" : [ + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj-streaming" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:prometheus-exporter" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:sql" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:solr-ref-guide" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:sql" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:solrj" + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:sql" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:solrj-streaming" + "projectPath" : ":solr:modules:sql" }, { - "configuration" : "compileClasspath", - "projectPath" : ":solr:solrj-zookeeper" - }, + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:sql" + } + ], + "954f156d" : [ { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:solrj-zookeeper" + "projectPath" : ":solr:api" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:api" }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:test-framework" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:test-framework" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:analysis-extras" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:analysis-extras" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:clustering" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:clustering" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:cross-dc" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:cross-dc" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:gcs-repository" + "projectPath" : ":solr:benchmark" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:gcs-repository" + "projectPath" : ":solr:benchmark" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:gcs-repository" + "projectPath" : ":solr:benchmark" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:hadoop-auth" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:hadoop-auth" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:hdfs" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:hdfs" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:jwt-auth" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:jwt-auth" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:langid" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:langid" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:ltr" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:ltr" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:opentelemetry" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:opentelemetry" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:s3-repository" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:s3-repository" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:scripting" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:scripting" + "projectPath" : ":solr:benchmark" }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:sql" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:sql" - } - ], - "a5b348ef" : [ - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:hadoop-auth" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" - } - ], - "a6a1e3c5" : [ - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solrj-streaming" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:hadoop-auth" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" + "projectPath" : ":solr:core" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:sql" + "projectPath" : ":solr:core" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:sql" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:sql" - } - ], - "a6fb6a35" : [ - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:api" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:benchmark" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:benchmark" - }, - { - "configuration" : "runtimeClasspath", "projectPath" : ":solr:core" }, { - "configuration" : "runtimeLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:core" }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:core" }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:cross-dc-manager" @@ -14413,19 +14063,19 @@ "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "testRuntimeClasspath", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:prometheus-exporter" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "runtimeLibs", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:prometheus-exporter" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:prometheus-exporter" }, { @@ -14440,16 +14090,24 @@ "configuration" : "runtimeClasspath", "projectPath" : ":solr:server" }, + { + "configuration" : "serverLib", + "projectPath" : ":solr:server" + }, { "configuration" : "solrCore", "projectPath" : ":solr:server" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solr-ref-guide" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:solr-ref-guide" }, { - "configuration" : "runtimeClasspath", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:solrj" }, { @@ -14457,7 +14115,7 @@ "projectPath" : ":solr:solrj" }, { - "configuration" : "runtimeClasspath", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:solrj-streaming" }, { @@ -14465,17 +14123,25 @@ "projectPath" : ":solr:solrj-streaming" }, { - "configuration" : "runtimeClasspath", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:solrj-zookeeper" }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:solrj-zookeeper" }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:test-framework" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:test-framework" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:test-framework" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:test-framework" @@ -14500,6 +14166,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:analysis-extras" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:analysis-extras" @@ -14516,6 +14186,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:clustering" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:clustering" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:clustering" @@ -14533,12 +14207,12 @@ "projectPath" : ":solr:modules:cross-dc" }, { - "configuration" : "testRuntimeClasspath", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:cross-dc" }, { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:extraction" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:cross-dc" }, { "configuration" : "runtimeClasspath", @@ -14572,6 +14246,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:gcs-repository" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:gcs-repository" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:gcs-repository" @@ -14588,6 +14266,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:hadoop-auth" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:hadoop-auth" @@ -14604,6 +14286,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:hdfs" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:hdfs" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:hdfs" @@ -14620,6 +14306,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:jwt-auth" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:jwt-auth" @@ -14636,6 +14326,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:langid" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:langid" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:langid" @@ -14652,6 +14346,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:ltr" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:ltr" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:ltr" @@ -14668,6 +14366,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:opentelemetry" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:opentelemetry" @@ -14684,6 +14386,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:s3-repository" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:s3-repository" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:s3-repository" @@ -14700,6 +14406,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:scripting" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:scripting" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:scripting" @@ -14716,196 +14426,36 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:sql" }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:sql" - } - ], - "a7f96198" : [ - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" - } - ], - "a9dcee72" : [ - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:api" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:benchmark" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:core" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:prometheus-exporter" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:server" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:solr-ref-guide" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:solrj" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:solrj-streaming" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:solrj-zookeeper" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:test-framework" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:webapp" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:analysis-extras" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:clustering" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:cross-dc" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:extraction" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:gcs-repository" - }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:gcs-repository" + "projectPath" : ":solr:modules:sql" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:hadoop-auth" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:hdfs" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:jwt-auth" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:langid" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:ltr" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:opentelemetry" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:s3-repository" - }, - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:scripting" - }, - { - "configuration" : "annotationProcessor", "projectPath" : ":solr:modules:sql" } ], - "aa7a59c6" : [ - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:gcs-repository" - }, + "970f2ee7" : [ { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:gcs-repository" + "projectPath" : ":solr:solrj-streaming" } ], - "acc31ef6" : [ - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, + "97e75301" : [ { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" + "projectPath" : ":solr:modules:extraction" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:hadoop-auth" + "projectPath" : ":solr:modules:extraction" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" + "projectPath" : ":solr:modules:extraction" } ], - "ad8f08d7" : [ + "99b82a6c" : [ { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:api" @@ -14918,10 +14468,6 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:benchmark" }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:core" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:core" @@ -14986,10 +14532,18 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:solrj-zookeeper" }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:test-framework" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:test-framework" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:test-framework" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:test-framework" @@ -15094,6 +14648,10 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:hadoop-auth" }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:hdfs" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:modules:hdfs" @@ -15106,6 +14664,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:hdfs" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:hdfs" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:hdfs" @@ -15223,170 +14785,186 @@ "projectPath" : ":solr:modules:sql" } ], - "b3b7541b" : [ + "9bcc8206" : [ { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:api" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:benchmark" + "configuration" : "runtimeLibs", + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:benchmark" + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:modules:jwt-auth" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:modules:jwt-auth" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:core" + "projectPath" : ":solr:modules:jwt-auth" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:modules:jwt-auth" }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + } + ], + "9e97e18c" : [ { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:core" }, { - "configuration" : "runtimeClasspath", + "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:cross-dc-manager" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:cross-dc-manager" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:analysis-extras" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:cross-dc" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:prometheus-exporter" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:prometheus-exporter" + "projectPath" : ":solr:modules:jwt-auth" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:server" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:ltr" }, { - "configuration" : "solrCore", - "projectPath" : ":solr:server" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:s3-repository" + } + ], + "a05ffa28" : [ + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:api" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solr-ref-guide" + "configuration" : "compileClasspath", + "projectPath" : ":solr:benchmark" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solrj" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:benchmark" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solrj-streaming" + "configuration" : "compileClasspath", + "projectPath" : ":solr:core" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solrj-zookeeper" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:core" }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:test-framework" + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:test-framework" + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:test-framework" + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:test-framework" + "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "solrCore", - "projectPath" : ":solr:webapp" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:prometheus-exporter" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solr-ref-guide" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solrj" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solrj-streaming" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "compileClasspath", + "projectPath" : ":solr:solrj-zookeeper" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:clustering" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solrj-zookeeper" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:clustering" + "configuration" : "compileClasspath", + "projectPath" : ":solr:test-framework" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:clustering" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:test-framework" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:clustering" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:analysis-extras" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:cross-dc" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:analysis-extras" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:cross-dc" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:clustering" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:cross-dc" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:clustering" }, { - "configuration" : "testRuntimeClasspath", + "configuration" : "compileClasspath", "projectPath" : ":solr:modules:cross-dc" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:extraction" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:cross-dc" }, { - "configuration" : "runtimeLibs", + "configuration" : "compileClasspath", "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:extraction" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "runtimeClasspath", @@ -15397,7 +14975,7 @@ "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:gcs-repository" }, { @@ -15405,132 +14983,120 @@ "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:hadoop-auth" - }, - { - "configuration" : "solrPlatformLibs", + "configuration" : "compileClasspath", "projectPath" : ":solr:modules:hadoop-auth" }, { - "configuration" : "testRuntimeClasspath", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:hadoop-auth" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:hdfs" - }, - { - "configuration" : "runtimeLibs", + "configuration" : "compileClasspath", "projectPath" : ":solr:modules:hdfs" }, { - "configuration" : "solrPlatformLibs", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:hdfs" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hdfs" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:jwt-auth" }, { - "configuration" : "runtimeClasspath", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:jwt-auth" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:jwt-auth" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:langid" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:jwt-auth" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:langid" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:jwt-auth" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:ltr" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:langid" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:ltr" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:langid" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:opentelemetry" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:langid" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:opentelemetry" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:langid" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:s3-repository" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:ltr" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:s3-repository" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:ltr" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:scripting" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:ltr" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:scripting" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:ltr" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:sql" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:sql" + } + ], + "a5b348ef" : [ { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:opentelemetry" - }, - { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:s3-repository" + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:s3-repository" + "projectPath" : ":solr:modules:hadoop-auth" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:s3-repository" - }, + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + } + ], + "a6a1e3c5" : [ { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:s3-repository" + "projectPath" : ":solr:solrj-streaming" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:scripting" + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:scripting" - }, - { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:scripting" + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:scripting" + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "runtimeClasspath", @@ -15540,101 +15106,47 @@ "configuration" : "runtimeLibs", "projectPath" : ":solr:modules:sql" }, - { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:sql" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:sql" } ], - "b4755bf3" : [ + "a6fb6a35" : [ { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:api" }, { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:benchmark" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:analysis-extras" + "projectPath" : ":solr:core" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:analysis-extras" + "projectPath" : ":solr:core" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:core" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" + "configuration" : "runtimeLibs", + "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hdfs" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:sql" - } - ], - "b57e9bf6" : [ - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:api" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:api" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:api" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:api" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:benchmark" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:benchmark" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:core" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:core" - }, - { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:core" - }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:cross-dc-manager" - }, - { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:cross-dc-manager" + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "testRuntimeClasspath", @@ -15656,6 +15168,10 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:prometheus-exporter" }, + { + "configuration" : "libExt", + "projectPath" : ":solr:server" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:server" @@ -15700,6 +15216,10 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:test-framework" }, + { + "configuration" : "serverLib", + "projectPath" : ":solr:webapp" + }, { "configuration" : "solrCore", "projectPath" : ":solr:webapp" @@ -15752,6 +15272,10 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:cross-dc" }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:extraction" + }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:modules:extraction" @@ -15764,6 +15288,10 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:extraction" }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:extraction" + }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:extraction" @@ -15929,71 +15457,191 @@ "projectPath" : ":solr:modules:sql" } ], - "b6a343e2" : [ + "a7f96198" : [ { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:jwt-auth" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:jwt-auth" + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:gcs-repository" } ], - "b6f115a3" : [ + "a9dcee72" : [ { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:extraction" + "configuration" : "annotationProcessor", + "projectPath" : ":solr:api" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:extraction" + "configuration" : "annotationProcessor", + "projectPath" : ":solr:benchmark" }, { - "configuration" : "runtimeLibs", + "configuration" : "annotationProcessor", + "projectPath" : ":solr:core" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:server" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:solr-ref-guide" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:solrj" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:solrj-streaming" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:solrj-zookeeper" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:webapp" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "annotationProcessor", "projectPath" : ":solr:modules:extraction" }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:gcs-repository" + }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:extraction" + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:extraction" + "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "compileClasspath", + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "annotationProcessor", "projectPath" : ":solr:modules:langid" }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:sql" + } + ], + "aa7a59c6" : [ + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:gcs-repository" + } + ], + "acc31ef6" : [ { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:langid" + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:langid" + "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:langid" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:langid" + "projectPath" : ":solr:modules:hadoop-auth" } ], - "bc8e8214" : [ + "ad8f08d7" : [ { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:api" @@ -16042,14 +15690,6 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:cross-dc-manager" }, - { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:prometheus-exporter" - }, - { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:prometheus-exporter" - }, { "configuration" : "solrPlatformLibs", "projectPath" : ":solr:prometheus-exporter" @@ -16058,10 +15698,6 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:prometheus-exporter" }, - { - "configuration" : "libExt", - "projectPath" : ":solr:server" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:server" @@ -16086,28 +15722,16 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:solrj-zookeeper" }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:test-framework" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:test-framework" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:test-framework" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:test-framework" }, { - "configuration" : "serverLib", - "projectPath" : ":solr:webapp" - }, - { - "configuration" : "solrCore", + "configuration" : "solrCore", "projectPath" : ":solr:webapp" }, { @@ -16158,10 +15782,6 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:cross-dc" }, - { - "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:extraction" - }, { "configuration" : "runtimeClasspath", "projectPath" : ":solr:modules:extraction" @@ -16174,10 +15794,6 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:extraction" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:extraction" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:extraction" @@ -16343,21 +15959,53 @@ "projectPath" : ":solr:modules:sql" } ], - "bddbe009" : [ + "b327e1dd" : [ { - "configuration" : "annotationProcessor", + "configuration" : "testCompileClasspath", "projectPath" : ":solr:api" }, { - "configuration" : "annotationProcessor", + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:api" + }, + { + "configuration" : "compileClasspath", "projectPath" : ":solr:benchmark" }, { - "configuration" : "annotationProcessor", + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "compileClasspath", "projectPath" : ":solr:core" }, { - "configuration" : "annotationProcessor", + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:core" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "compileClasspath", "projectPath" : ":solr:cross-dc-manager" }, { @@ -16369,162 +16017,184 @@ "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "testRuntimeClasspath", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:prometheus-exporter" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:server" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:solr-ref-guide" + "configuration" : "compileClasspath", + "projectPath" : ":solr:prometheus-exporter" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:solrj" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:prometheus-exporter" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:solrj-streaming" + "configuration" : "runtimeLibs", + "projectPath" : ":solr:prometheus-exporter" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:solrj-zookeeper" + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:prometheus-exporter" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:test-framework" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:prometheus-exporter" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:webapp" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:prometheus-exporter" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:analysis-extras" + "configuration" : "libExt", + "projectPath" : ":solr:server" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:clustering" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:server" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:cross-dc" + "configuration" : "serverLib", + "projectPath" : ":solr:server" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:extraction" + "configuration" : "solrCore", + "projectPath" : ":solr:server" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:gcs-repository" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solr-ref-guide" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:hadoop-auth" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solr-ref-guide" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:hdfs" + "configuration" : "compileClasspath", + "projectPath" : ":solr:solrj" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:jwt-auth" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:solrj" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:langid" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solrj" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:ltr" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:opentelemetry" + "configuration" : "compileClasspath", + "projectPath" : ":solr:solrj-streaming" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:s3-repository" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:solrj-streaming" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:scripting" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solrj-streaming" }, { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:modules:sql" - } - ], - "bf04d2b8" : [ + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj-streaming" + }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:modules:hadoop-auth" + "projectPath" : ":solr:solrj-zookeeper" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" + "projectPath" : ":solr:solrj-zookeeper" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:hadoop-auth" + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:solrj-zookeeper" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj-zookeeper" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:test-framework" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:hadoop-auth" + "projectPath" : ":solr:test-framework" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" - } - ], - "c1e4e901" : [ + "projectPath" : ":solr:test-framework" + }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:jwt-auth" + "configuration" : "serverLib", + "projectPath" : ":solr:webapp" + }, + { + "configuration" : "solrCore", + "projectPath" : ":solr:webapp" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:analysis-extras" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:analysis-extras" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:analysis-extras" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" - } - ], - "c6acb8a9" : [ + "projectPath" : ":solr:modules:analysis-extras" + }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:clustering" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:clustering" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:clustering" }, { "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:clustering" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:clustering" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:clustering" }, { "configuration" : "compileClasspath", @@ -16538,6 +16208,10 @@ "configuration" : "runtimeLibs", "projectPath" : ":solr:modules:cross-dc" }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:cross-dc" + }, { "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:cross-dc" @@ -16545,37 +16219,31 @@ { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:cross-dc" - } - ], - "c718e885" : [ - { - "configuration" : "annotationProcessor", - "projectPath" : ":solr:benchmark" }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:benchmark" + "projectPath" : ":solr:modules:extraction" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:benchmark" + "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:benchmark" + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:benchmark" - } - ], - "c77c5ec7" : [ + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:extraction" + }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:jwt-auth" - } - ], - "cef2dbfe" : [ + "projectPath" : ":solr:modules:extraction" + }, { "configuration" : "compileClasspath", "projectPath" : ":solr:modules:gcs-repository" @@ -16589,146 +16257,310 @@ "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "testCompileClasspath", + "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "testRuntimeClasspath", + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:gcs-repository" }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" - } - ], - "d008b72a" : [ + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hdfs" + }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:api" + "projectPath" : ":solr:modules:hdfs" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:api" + "projectPath" : ":solr:modules:hdfs" }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:benchmark" + "projectPath" : ":solr:modules:jwt-auth" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:benchmark" + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:jwt-auth" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:benchmark" + "projectPath" : ":solr:modules:jwt-auth" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:benchmark" + "projectPath" : ":solr:modules:jwt-auth" }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:modules:langid" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:modules:langid" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:core" + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:langid" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:modules:langid" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:core" + "projectPath" : ":solr:modules:langid" }, { "configuration" : "compileClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:ltr" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:ltr" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:ltr" }, { "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:ltr" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:ltr" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:cross-dc-manager" + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:opentelemetry" }, { "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:prometheus-exporter" + "projectPath" : ":solr:modules:opentelemetry" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:prometheus-exporter" + "projectPath" : ":solr:modules:opentelemetry" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:prometheus-exporter" + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:s3-repository" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:server" + "projectPath" : ":solr:modules:s3-repository" }, { - "configuration" : "serverLib", - "projectPath" : ":solr:server" + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:s3-repository" }, { - "configuration" : "solrCore", - "projectPath" : ":solr:server" + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:s3-repository" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:solr-ref-guide" + "projectPath" : ":solr:modules:s3-repository" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solr-ref-guide" + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:scripting" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:solrj" + "projectPath" : ":solr:modules:scripting" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solrj" + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:sql" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:solrj-streaming" + "projectPath" : ":solr:modules:sql" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:solrj-streaming" + "projectPath" : ":solr:modules:sql" + } + ], + "b3b7541b" : [ + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:api" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:core" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:solrj-zookeeper" + "projectPath" : ":solr:core" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:server" + }, + { + "configuration" : "solrCore", + "projectPath" : ":solr:server" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solr-ref-guide" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj-streaming" }, { "configuration" : "testRuntimeClasspath", @@ -16750,10 +16582,6 @@ "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:test-framework" }, - { - "configuration" : "serverLib", - "projectPath" : ":solr:webapp" - }, { "configuration" : "solrCore", "projectPath" : ":solr:webapp" @@ -16770,10 +16598,6 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:analysis-extras" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:analysis-extras" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:analysis-extras" @@ -16790,10 +16614,6 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:clustering" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:clustering" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:clustering" @@ -16810,10 +16630,6 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:cross-dc" }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:cross-dc" - }, { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:cross-dc" @@ -16830,6 +16646,796 @@ "configuration" : "solrPlatformLibs", "projectPath" : ":solr:modules:extraction" }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:sql" + } + ], + "b4755bf3" : [ + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:sql" + } + ], + "b57e9bf6" : [ + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:api" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:api" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:api" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:api" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:core" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:server" + }, + { + "configuration" : "solrCore", + "projectPath" : ":solr:server" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solr-ref-guide" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:solrj" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:solrj-streaming" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj-streaming" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:solrj-zookeeper" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj-zookeeper" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "solrCore", + "projectPath" : ":solr:webapp" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:sql" + } + ], + "b6a343e2" : [ + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + } + ], + "b6f115a3" : [ + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:langid" + } + ], + "bc8e8214" : [ + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:api" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:core" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:core" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "libExt", + "projectPath" : ":solr:server" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:server" + }, + { + "configuration" : "solrCore", + "projectPath" : ":solr:server" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solr-ref-guide" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj-streaming" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:solrj-zookeeper" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "serverLib", + "projectPath" : ":solr:webapp" + }, + { + "configuration" : "solrCore", + "projectPath" : ":solr:webapp" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:extraction" + }, { "configuration" : "testCompileClasspath", "projectPath" : ":solr:modules:extraction" @@ -16851,192 +17457,418 @@ "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:gcs-repository" + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:sql" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:sql" + } + ], + "bddbe009" : [ + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:api" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:benchmark" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:core" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "runtimeLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:server" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:solr-ref-guide" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:solrj" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:solrj-streaming" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:solrj-zookeeper" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:test-framework" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:webapp" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:extraction" }, { - "configuration" : "testRuntimeClasspath", + "configuration" : "annotationProcessor", "projectPath" : ":solr:modules:gcs-repository" }, { - "configuration" : "runtimeClasspath", + "configuration" : "annotationProcessor", "projectPath" : ":solr:modules:hadoop-auth" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:hadoop-auth" + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:hdfs" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:hadoop-auth" + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:jwt-auth" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:hadoop-auth" + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:langid" }, { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hadoop-auth" + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:ltr" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:hdfs" + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:opentelemetry" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:hdfs" + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:s3-repository" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:hdfs" + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:scripting" }, { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:hdfs" - }, + "configuration" : "annotationProcessor", + "projectPath" : ":solr:modules:sql" + } + ], + "bf04d2b8" : [ { - "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:hdfs" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:jwt-auth" + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:jwt-auth" - }, - { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:jwt-auth" + "projectPath" : ":solr:modules:hadoop-auth" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:jwt-auth" + "projectPath" : ":solr:modules:hadoop-auth" }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:hadoop-auth" + } + ], + "c1e4e901" : [ { "configuration" : "testRuntimeClasspath", "projectPath" : ":solr:modules:jwt-auth" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:langid" + "projectPath" : ":solr:modules:opentelemetry" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:langid" - }, - { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:langid" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:langid" + "projectPath" : ":solr:modules:opentelemetry" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:langid" + "projectPath" : ":solr:modules:opentelemetry" + } + ], + "c6acb8a9" : [ + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:ltr" + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:ltr" + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:ltr" + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:ltr" + "projectPath" : ":solr:cross-dc-manager" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:ltr" + "projectPath" : ":solr:cross-dc-manager" }, { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:cross-dc" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:opentelemetry" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:modules:cross-dc" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:opentelemetry" + "configuration" : "runtimeLibs", + "projectPath" : ":solr:modules:cross-dc" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:opentelemetry" + "projectPath" : ":solr:modules:cross-dc" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:opentelemetry" - }, + "projectPath" : ":solr:modules:cross-dc" + } + ], + "c718e885" : [ { - "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:s3-repository" + "configuration" : "annotationProcessor", + "projectPath" : ":solr:benchmark" }, { - "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:s3-repository" + "configuration" : "compileClasspath", + "projectPath" : ":solr:benchmark" }, { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:s3-repository" + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:benchmark" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:s3-repository" + "projectPath" : ":solr:benchmark" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:s3-repository" + "projectPath" : ":solr:benchmark" + } + ], + "c77c5ec7" : [ + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:jwt-auth" + } + ], + "cef2dbfe" : [ + { + "configuration" : "compileClasspath", + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:scripting" + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:scripting" - }, - { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:scripting" + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:scripting" + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:scripting" + "projectPath" : ":solr:modules:gcs-repository" }, { "configuration" : "runtimeClasspath", - "projectPath" : ":solr:modules:sql" + "projectPath" : ":solr:modules:opentelemetry" }, { "configuration" : "runtimeLibs", - "projectPath" : ":solr:modules:sql" - }, - { - "configuration" : "solrPlatformLibs", - "projectPath" : ":solr:modules:sql" - }, - { - "configuration" : "testCompileClasspath", - "projectPath" : ":solr:modules:sql" + "projectPath" : ":solr:modules:opentelemetry" }, { "configuration" : "testRuntimeClasspath", - "projectPath" : ":solr:modules:sql" + "projectPath" : ":solr:modules:opentelemetry" } ], "d3d191b2" : [ @@ -18053,6 +18885,92 @@ "projectPath" : ":solr:modules:sql" } ], + "e2aa299c" : [ + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:cross-dc-manager" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:prometheus-exporter" + }, + { + "configuration" : "libExt", + "projectPath" : ":solr:server" + }, + { + "configuration" : "runtimeClasspath", + "projectPath" : ":solr:server" + }, + { + "configuration" : "serverLib", + "projectPath" : ":solr:webapp" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:analysis-extras" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:clustering" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:cross-dc" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:extraction" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:gcs-repository" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hadoop-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:hdfs" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:jwt-auth" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:langid" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:ltr" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:opentelemetry" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "testCompileClasspath", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "testRuntimeClasspath", + "projectPath" : ":solr:modules:s3-repository" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:scripting" + }, + { + "configuration" : "solrPlatformLibs", + "projectPath" : ":solr:modules:sql" + } + ], "e5b524d7" : [ { "configuration" : "annotationProcessor",