You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/11/10 17:40:09 UTC
[solr] branch main updated: SOLR-15955: Update Jetty dependency to 10 (#585)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 96ddf2c4c7c SOLR-15955: Update Jetty dependency to 10 (#585)
96ddf2c4c7c is described below
commit 96ddf2c4c7cd52181ae51e1c966eb3e3bfef5c02
Author: Mark Robert Miller <ma...@gmail.com>
AuthorDate: Thu Nov 10 11:40:04 2022 -0600
SOLR-15955: Update Jetty dependency to 10 (#585)
* Upgrades to Jetty 10.0.12
* Upgrades dropwizard metrics 4.2.12 for `dropwizard-metrics9` -> `dropwizard-metrics10`
* Upgrades log4j 2.19.0 and slf4j 2.0.3 for Jetty 10
* For s3mock specifically, upgrade spring-boot 2.5.14 and spring 5.3.23 to handle Jetty 10
Co-authored-by: Kevin Risden <kr...@apache.org>
Co-authored-by: David Smiley <ds...@apache.org>
---
solr/core/build.gradle | 26 +-
.../client/solrj/embedded/JettySolrRunner.java | 12 +-
.../java/org/apache/solr/logging/LogWatcher.java | 3 +-
.../org/apache/solr/request/json/RequestUtil.java | 5 +
.../apache/solr/servlet/SolrRequestParsers.java | 24 +-
.../org/apache/solr/util/StartupLoggingUtils.java | 8 +-
.../solr/handler/admin/MetricsHandlerTest.java | 4 +-
solr/licenses/http2-client-10.0.12.jar.sha1 | 1 +
.../http2-client-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/http2-common-10.0.12.jar.sha1 | 1 +
.../http2-common-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/http2-hpack-10.0.12.jar.sha1 | 1 +
.../licenses/http2-hpack-9.4.48.v20220622.jar.sha1 | 1 -
.../http2-http-client-transport-10.0.12.jar.sha1 | 1 +
...http-client-transport-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/http2-server-10.0.12.jar.sha1 | 1 +
.../http2-server-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jakarta.el-3.0.3.jar.sha1 | 1 -
solr/licenses/jakarta.el-LICENSE-EPL.txt | 277 -----
solr/licenses/jakarta.el-NOTICE.txt | 45 -
solr/licenses/javax.servlet-api-3.1.0.jar.sha1 | 1 -
solr/licenses/javax.servlet-api-LICENSE-CDDL.txt | 126 ---
solr/licenses/javax.servlet-api-NOTICE.txt | 2 -
solr/licenses/jcl-over-slf4j-1.7.36.jar.sha1 | 1 -
solr/licenses/jcl-over-slf4j-2.0.3.jar.sha1 | 1 +
solr/licenses/jetty-alpn-client-10.0.12.jar.sha1 | 1 +
.../jetty-alpn-client-9.4.48.v20220622.jar.sha1 | 1 -
.../jetty-alpn-java-client-10.0.12.jar.sha1 | 1 +
...etty-alpn-java-client-9.4.48.v20220622.jar.sha1 | 1 -
.../jetty-alpn-java-server-10.0.12.jar.sha1 | 1 +
...etty-alpn-java-server-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-alpn-server-10.0.12.jar.sha1 | 1 +
.../jetty-alpn-server-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-client-10.0.12.jar.sha1 | 1 +
.../jetty-client-9.4.48.v20220622.jar.sha1 | 1 -
.../jetty-continuation-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-deploy-10.0.12.jar.sha1 | 1 +
.../jetty-deploy-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-http-10.0.12.jar.sha1 | 1 +
solr/licenses/jetty-http-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-io-10.0.12.jar.sha1 | 1 +
solr/licenses/jetty-io-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-jmx-10.0.12.jar.sha1 | 1 +
solr/licenses/jetty-jmx-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-rewrite-10.0.12.jar.sha1 | 1 +
.../jetty-rewrite-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-security-10.0.12.jar.sha1 | 1 +
.../jetty-security-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-server-10.0.12.jar.sha1 | 1 +
.../jetty-server-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-servlet-10.0.12.jar.sha1 | 1 +
.../jetty-servlet-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-servlet-api-4.0.6.jar.sha1 | 1 +
solr/licenses/jetty-servlets-10.0.12.jar.sha1 | 1 +
.../jetty-servlets-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-start-10.0.12-shaded.jar.sha1 | 1 +
.../jetty-start-9.4.48.v20220622-shaded.jar.sha1 | 1 -
solr/licenses/jetty-util-10.0.12.jar.sha1 | 1 +
solr/licenses/jetty-util-9.4.48.v20220622.jar.sha1 | 1 -
.../jetty-util-ajax-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-webapp-10.0.12.jar.sha1 | 1 +
.../jetty-webapp-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jetty-xml-10.0.12.jar.sha1 | 1 +
solr/licenses/jetty-xml-9.4.48.v20220622.jar.sha1 | 1 -
solr/licenses/jul-to-slf4j-1.7.36.jar.sha1 | 1 -
solr/licenses/jul-to-slf4j-2.0.3.jar.sha1 | 1 +
solr/licenses/log4j-1.2-api-2.17.2.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.19.0.jar.sha1 | 1 +
solr/licenses/log4j-api-2.17.2.jar.sha1 | 1 -
solr/licenses/log4j-api-2.19.0.jar.sha1 | 1 +
solr/licenses/log4j-core-2.17.2.jar.sha1 | 1 -
solr/licenses/log4j-core-2.19.0.jar.sha1 | 1 +
.../log4j-layout-template-json-2.17.2.jar.sha1 | 1 -
.../log4j-layout-template-json-2.19.0.jar.sha1 | 1 +
solr/licenses/log4j-slf4j-impl-2.17.2.jar.sha1 | 1 -
...ICENSE-ASL.txt => log4j-slf4j2-LICENSE-ASL.txt} | 0
...4j-slf4j-NOTICE.txt => log4j-slf4j2-NOTICE.txt} | 0
solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1 | 1 +
solr/licenses/log4j-web-2.17.2.jar.sha1 | 1 -
solr/licenses/log4j-web-2.19.0.jar.sha1 | 1 +
solr/licenses/metrics-core-4.1.5.jar.sha1 | 1 -
solr/licenses/metrics-core-4.2.12.jar.sha1 | 1 +
solr/licenses/metrics-graphite-4.1.5.jar.sha1 | 1 -
solr/licenses/metrics-graphite-4.2.12.jar.sha1 | 1 +
solr/licenses/metrics-jetty10-4.2.12.jar.sha1 | 1 +
...NSE-ASL.txt => metrics-jetty10-LICENSE-ASL.txt} | 0
...etty9-NOTICE.txt => metrics-jetty10-NOTICE.txt} | 0
solr/licenses/metrics-jetty9-4.1.5.jar.sha1 | 1 -
solr/licenses/metrics-jmx-4.1.5.jar.sha1 | 1 -
solr/licenses/metrics-jmx-4.2.12.jar.sha1 | 1 +
solr/licenses/metrics-jvm-4.1.5.jar.sha1 | 1 -
solr/licenses/metrics-jvm-4.2.12.jar.sha1 | 1 +
solr/licenses/micrometer-core-1.5.14.jar.sha1 | 1 -
solr/licenses/micrometer-core-1.7.12.jar.sha1 | 1 +
solr/licenses/slf4j-api-1.7.36.jar.sha1 | 1 -
solr/licenses/slf4j-api-2.0.3.jar.sha1 | 1 +
solr/licenses/snakeyaml-1.26.jar.sha1 | 1 -
solr/licenses/snakeyaml-1.28.jar.sha1 | 1 +
solr/licenses/spring-aop-5.2.15.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-aop-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-beans-5.2.15.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-beans-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-boot-2.3.12.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-boot-2.5.14.jar.sha1 | 1 +
.../spring-boot-actuator-2.3.12.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-boot-actuator-2.5.14.jar.sha1 | 1 +
...-actuator-autoconfigure-2.3.12.RELEASE.jar.sha1 | 1 -
...ing-boot-actuator-autoconfigure-2.5.14.jar.sha1 | 1 +
...ring-boot-autoconfigure-2.3.12.RELEASE.jar.sha1 | 1 -
.../spring-boot-autoconfigure-2.5.14.jar.sha1 | 1 +
.../spring-boot-starter-2.3.12.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-boot-starter-2.5.14.jar.sha1 | 1 +
...g-boot-starter-actuator-2.3.12.RELEASE.jar.sha1 | 1 -
.../spring-boot-starter-actuator-2.5.14.jar.sha1 | 1 +
...ring-boot-starter-jetty-2.3.12.RELEASE.jar.sha1 | 1 -
.../spring-boot-starter-jetty-2.5.14.jar.sha1 | 1 +
...pring-boot-starter-json-2.3.12.RELEASE.jar.sha1 | 1 -
.../spring-boot-starter-json-2.5.14.jar.sha1 | 1 +
...ng-boot-starter-logging-2.3.12.RELEASE.jar.sha1 | 1 -
.../spring-boot-starter-logging-2.5.14.jar.sha1 | 1 +
...spring-boot-starter-web-2.3.12.RELEASE.jar.sha1 | 1 -
.../spring-boot-starter-web-2.5.14.jar.sha1 | 1 +
.../spring-context-5.2.15.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-context-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-core-5.2.15.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-core-5.3.23.jar.sha1 | 1 +
.../spring-expression-5.2.15.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-expression-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-jcl-5.2.15.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-jcl-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-web-5.2.15.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-web-5.3.23.jar.sha1 | 1 +
.../licenses/spring-webmvc-5.2.15.RELEASE.jar.sha1 | 1 -
solr/licenses/spring-webmvc-5.3.23.jar.sha1 | 1 +
solr/licenses/tomcat-embed-el-9.0.63.jar.sha1 | 1 +
solr/licenses/tomcat-embed-el-LICENSE-ASL.txt | 1143 ++++++++++++++++++++
solr/licenses/tomcat-embed-el-NOTICE.txt | 68 ++
solr/modules/hadoop-auth/build.gradle | 2 +-
.../hadoop/AttributeOnlyServletContext.java | 29 +
.../client/solrj/impl/Krb5HttpClientUtils.java | 2 +-
solr/modules/jwt-auth/build.gradle | 2 +-
solr/modules/s3-repository/build.gradle | 2 +
.../org/apache/solr/s3/S3BackupRepositoryTest.java | 10 +-
.../apache/solr/s3/S3IncrementalBackupTest.java | 6 +-
.../org/apache/solr/s3/S3OutputStreamTest.java | 2 +-
.../test/org/apache/solr/s3/S3ReadWriteTest.java | 6 +-
solr/prometheus-exporter/build.gradle | 2 +-
solr/server/build.gradle | 7 +-
solr/server/contexts/solr-jetty-context.xml | 2 +-
solr/server/etc/jetty-gzip.xml | 18 +-
solr/server/etc/jetty-http.xml | 2 +-
solr/server/etc/jetty-https.xml | 2 +-
solr/server/etc/jetty-requestlog.xml | 2 +-
solr/server/etc/jetty-ssl.xml | 2 +-
solr/server/etc/jetty.xml | 8 +-
solr/solrj/build.gradle | 5 +-
.../solrj/impl/AuthenticationStoreHolder.java | 80 ++
.../solr/client/solrj/impl/Http2SolrClient.java | 39 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 2 +-
.../client/solrj/impl/Krb5HttpClientBuilder.java | 2 +-
.../PreemptiveBasicAuthClientBuilderFactory.java | 2 +-
.../client/solrj/util/SolrBasicAuthentication.java | 7 +-
solr/test-framework/build.gradle | 4 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 4 +-
versions.lock | 126 ++-
versions.props | 12 +-
166 files changed, 1586 insertions(+), 666 deletions(-)
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 51b4d0780ed..a8029f79406 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -83,19 +83,27 @@ dependencies {
runtimeOnly('org.eclipse.jetty:jetty-alpn-java-server', {
exclude group: "org.eclipse.jetty.alpn", module: "alpn-api"
})
- jettyClientImplementation 'org.eclipse.jetty:jetty-http'
- jettyClientImplementation 'org.eclipse.jetty:jetty-io'
+ jettyClientImplementation('org.eclipse.jetty:jetty-http', {
+ exclude group: "org.slf4j", module: "slf4j-api"
+ })
+ jettyClientImplementation('org.eclipse.jetty:jetty-io', {
+ exclude group: "org.slf4j", module: "slf4j-api"
+ })
implementation 'org.eclipse.jetty:jetty-rewrite'
implementation 'org.eclipse.jetty:jetty-server'
implementation 'org.eclipse.jetty:jetty-servlet'
- jettyClientImplementation 'org.eclipse.jetty:jetty-util'
+ jettyClientImplementation('org.eclipse.jetty:jetty-util', {
+ exclude group: "org.slf4j", module: "slf4j-api"
+ })
- jettyClientImplementation 'org.eclipse.jetty.http2:http2-common'
+ jettyClientImplementation('org.eclipse.jetty.http2:http2-common', {
+ exclude group: "org.slf4j", module: "slf4j-api"
+ })
implementation 'org.eclipse.jetty.http2:http2-server'
- implementation 'javax.servlet:javax.servlet-api'
-
- implementation 'org.glassfish.jersey.containers:jersey-container-jetty-http'
+ implementation('org.glassfish.jersey.containers:jersey-container-jetty-http', {
+ exclude group: "org.eclipse.jetty", module: "jetty-continuation"
+ })
permitUnusedDeclared 'org.glassfish.jersey.containers:jersey-container-jetty-http'
implementation 'org.glassfish.jersey.inject:jersey-hk2'
permitUnusedDeclared 'org.glassfish.jersey.inject:jersey-hk2'
@@ -152,6 +160,8 @@ dependencies {
implementation 'org.apache.httpcomponents:httpclient'
implementation 'org.apache.httpcomponents:httpcore'
+ compileOnlyApi 'org.eclipse.jetty.toolchain:jetty-servlet-api'
+
implementation 'org.eclipse.jetty:jetty-client'
// ZooKeeper
@@ -186,7 +196,7 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.logging.log4j:log4j-core'
- implementation 'org.apache.logging.log4j:log4j-slf4j-impl'
+ runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl'
// For faster XML processing than the JDK
implementation 'org.codehaus.woodstox:stax2-api'
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 0971655bbd0..6d88a5ad7b6 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -303,7 +303,11 @@ public class JettySolrRunner {
ServerConnector connector;
if (sslcontext != null) {
configuration.setSecureScheme("https");
- configuration.addCustomizer(new SecureRequestCustomizer());
+ SecureRequestCustomizer customizer = new SecureRequestCustomizer(false);
+ sslcontext.setSniRequired(false);
+ customizer.setSniHostCheck(false);
+
+ configuration.addCustomizer(customizer);
HttpConnectionFactory http1ConnectionFactory = new HttpConnectionFactory(configuration);
if (config.onlyHttp1 || !Constants.JRE_IS_MINIMUM_JAVA9) {
@@ -369,8 +373,9 @@ public class JettySolrRunner {
// Initialize the servlets
final ServletContextHandler root =
new ServletContextHandler(server, config.context, ServletContextHandler.SESSIONS);
+ root.setResourceBase(".");
- server.addLifeCycleListener(
+ server.addEventListener(
new LifeCycle.Listener() {
@Override
@@ -451,9 +456,6 @@ public class JettySolrRunner {
gzipHandler.setHandler(chain);
gzipHandler.setMinGzipSize(23); // https://github.com/eclipse/jetty.project/issues/4191
- gzipHandler.setCheckGzExists(false);
- gzipHandler.setCompressionLevel(-1);
- gzipHandler.setExcludedAgentPatterns(".*MSIE.6\\.0.*");
gzipHandler.setIncludedMethods("GET");
server.setHandler(gzipHandler);
diff --git a/solr/core/src/java/org/apache/solr/logging/LogWatcher.java b/solr/core/src/java/org/apache/solr/logging/LogWatcher.java
index ef4c9b0bfe2..e023d99d0c6 100644
--- a/solr/core/src/java/org/apache/solr/logging/LogWatcher.java
+++ b/solr/core/src/java/org/apache/solr/logging/LogWatcher.java
@@ -28,7 +28,6 @@ import org.apache.solr.logging.jul.JulWatcher;
import org.apache.solr.logging.log4j2.Log4j2Watcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.impl.StaticLoggerBinder;
/**
* A Class to monitor Logging events and hold N events in memory
@@ -150,7 +149,7 @@ public abstract class LogWatcher<E> {
String slf4jImpl;
try {
- slf4jImpl = StaticLoggerBinder.getSingleton().getLoggerFactoryClassStr();
+ slf4jImpl = LoggerFactory.getILoggerFactory().getClass().getName();
log.debug("SLF4J impl is {}", slf4jImpl);
if (fname == null) {
if ("org.apache.logging.slf4j.Log4jLoggerFactory".equals(slf4jImpl)) {
diff --git a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java
index 63b1958f6cb..ab3b1b3ef23 100644
--- a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java
+++ b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java
@@ -76,6 +76,11 @@ public class RequestUtil {
String[] jsonFromParams = map.remove(JSON);
for (ContentStream cs : req.getContentStreams()) {
+ // if BinaryResponseParser.BINARY_CONTENT_TYPE, let the following fail below - we may have
+ // adjusted the content without updating the content type
+ // problem in this case happens in a few tests, one seems to happen with kerberos and remote
+ // node query (HttpSolrCall's request proxy)
+
String contentType = cs.getContentType();
if (contentType == null || !contentType.contains("/json")) {
throw new SolrException(
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
index 0a4135226a1..6a3f0f9176c 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@ -62,8 +62,6 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.util.RTimerTree;
-import org.eclipse.jetty.http.HttpFields;
-import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.server.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -623,7 +621,7 @@ public class SolrRequestParsers {
}
// Magic way to tell Jetty dynamically we want multi-part processing. "Request" here is a
// Jetty class
- req.setAttribute(Request.MULTIPART_CONFIG_ELEMENT, multipartConfigElement);
+ req.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, multipartConfigElement);
MultiMapSolrParams params = parseQueryString(req.getQueryString());
@@ -642,12 +640,6 @@ public class SolrRequestParsers {
return params;
}
- static boolean isMultipart(HttpServletRequest req) {
- // Jetty utilities
- return MimeTypes.Type.MULTIPART_FORM_DATA.is(
- HttpFields.valueParameters(req.getContentType(), null));
- }
-
/** Wrap a MultiPart-{@link Part} as a {@link ContentStream} */
static class PartContentStream extends ContentStreamBase {
private final Part part;
@@ -667,9 +659,14 @@ public class SolrRequestParsers {
}
}
+ public static boolean isMultipart(HttpServletRequest req) {
+ String ct = req.getContentType();
+ return ct != null && ct.startsWith("multipart/form-data");
+ }
+
/** Clean up any files created by MultiPartInputStream. */
static void cleanupMultipartFiles(HttpServletRequest request) {
- if (!MultipartRequestParser.isMultipart(request)) {
+ if (!SolrRequestParsers.isMultipart(request)) {
return;
}
@@ -837,6 +834,11 @@ public class SolrRequestParsers {
return parseQueryString(req.getQueryString());
}
+ // This happens when Jetty redirected a request that initially had no content body
+ if (contentType.equals("application/octet-stream") && req.getContentLength() == 0) {
+ return parseQueryString(req.getQueryString());
+ }
+
// OK, we have a BODY at this point
boolean schemaRestPath = false;
@@ -869,7 +871,7 @@ public class SolrRequestParsers {
return formdata.parseParamsAndFillStreams(req, streams, input);
}
- if (MultipartRequestParser.isMultipart(req)) {
+ if (isMultipart(req)) {
return multipart.parseParamsAndFillStreams(req, streams);
}
diff --git a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
index 8a12e95637b..aa2fcd5d323 100644
--- a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
@@ -28,9 +28,9 @@ import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.solr.common.util.SuppressForbidden;
+import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.impl.StaticLoggerBinder;
/**
* Handles programmatic modification of logging during startup
@@ -40,7 +40,7 @@ import org.slf4j.impl.StaticLoggerBinder;
*/
public final class StartupLoggingUtils {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private static final StaticLoggerBinder binder = StaticLoggerBinder.getSingleton();
+ private static final ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
/** Checks whether mandatory log dir is given */
public static void checkLogDir() {
@@ -50,7 +50,7 @@ public final class StartupLoggingUtils {
}
public static String getLoggerImplStr() { // nowarn
- return binder.getLoggerFactoryClassStr();
+ return loggerFactory.getClass().getName();
}
/**
@@ -119,7 +119,7 @@ public final class StartupLoggingUtils {
Class.forName("org.apache.logging.log4j.LogManager");
// Make sure that log4j is really selected as logger in slf4j - we could have LogManager in
// the bridge class :)
- return binder.getLoggerFactoryClassStr().contains("Log4jLoggerFactory");
+ return getLoggerImplStr().contains("Log4jLoggerFactory");
} catch (Exception e) {
return false;
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
index dd4eeb2d73e..1f4697ecc10 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
@@ -240,9 +240,9 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
assertNotNull(values.get("metrics"));
values = (NamedList<?>) values.get("metrics");
assertEquals(1, values.size());
- assertEquals(13, ((NamedList<?>) values.get("solr.node")).size());
assertNotNull(values.get("solr.node"));
values = (NamedList<?>) values.get("solr.node");
+ assertEquals(27, values.size());
assertNotNull(values.get("CONTAINER.cores.lazy")); // this is a gauge node
assertNotNull(values.get("CONTAINER.threadPool.coreContainerWorkExecutor.completed"));
assertNotNull(values.get("CONTAINER.threadPool.coreLoadExecutor.completed"));
@@ -266,7 +266,7 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
values = (NamedList<?>) values.get("metrics");
assertNotNull(values.get("solr.node"));
values = (NamedList<?>) values.get("solr.node");
- assertEquals(5, values.size());
+ assertEquals(7, values.size());
assertNotNull(values.get("CONTAINER.threadPool.coreContainerWorkExecutor.completed"));
assertNotNull(values.get("CONTAINER.threadPool.coreLoadExecutor.completed"));
diff --git a/solr/licenses/http2-client-10.0.12.jar.sha1 b/solr/licenses/http2-client-10.0.12.jar.sha1
new file mode 100644
index 00000000000..d22aa64c055
--- /dev/null
+++ b/solr/licenses/http2-client-10.0.12.jar.sha1
@@ -0,0 +1 @@
+631e8b6c2258af98c17af37c5a57e4bd3daeab4f
diff --git a/solr/licenses/http2-client-9.4.48.v20220622.jar.sha1 b/solr/licenses/http2-client-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 872ff3038d1..00000000000
--- a/solr/licenses/http2-client-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-92d50764a8ec042772cea815ced63212b3f8f8df
diff --git a/solr/licenses/http2-common-10.0.12.jar.sha1 b/solr/licenses/http2-common-10.0.12.jar.sha1
new file mode 100644
index 00000000000..4ac9e851ca4
--- /dev/null
+++ b/solr/licenses/http2-common-10.0.12.jar.sha1
@@ -0,0 +1 @@
+c84d86741bb91c3418e09c2ae58572aa2e9d58d8
diff --git a/solr/licenses/http2-common-9.4.48.v20220622.jar.sha1 b/solr/licenses/http2-common-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 6e1717f486c..00000000000
--- a/solr/licenses/http2-common-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d9dd860a7e9bb8227b137bd63c8630cbb6cac9cf
diff --git a/solr/licenses/http2-hpack-10.0.12.jar.sha1 b/solr/licenses/http2-hpack-10.0.12.jar.sha1
new file mode 100644
index 00000000000..3b8df88da0c
--- /dev/null
+++ b/solr/licenses/http2-hpack-10.0.12.jar.sha1
@@ -0,0 +1 @@
+81c93a695fa9c5361b78ff84347730834ee70316
diff --git a/solr/licenses/http2-hpack-9.4.48.v20220622.jar.sha1 b/solr/licenses/http2-hpack-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 1cd3300a877..00000000000
--- a/solr/licenses/http2-hpack-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dab003d88e03d92cd0c94452297d476aa5e0c566
diff --git a/solr/licenses/http2-http-client-transport-10.0.12.jar.sha1 b/solr/licenses/http2-http-client-transport-10.0.12.jar.sha1
new file mode 100644
index 00000000000..07387f80961
--- /dev/null
+++ b/solr/licenses/http2-http-client-transport-10.0.12.jar.sha1
@@ -0,0 +1 @@
+658eb6bc338aa7fa4c2eed8dd46f4d39cfdbcf52
diff --git a/solr/licenses/http2-http-client-transport-9.4.48.v20220622.jar.sha1 b/solr/licenses/http2-http-client-transport-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 40af10364f0..00000000000
--- a/solr/licenses/http2-http-client-transport-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-753094fc5d944b5c000246244bb1269ef4eda70c
diff --git a/solr/licenses/http2-server-10.0.12.jar.sha1 b/solr/licenses/http2-server-10.0.12.jar.sha1
new file mode 100644
index 00000000000..680ce788f8f
--- /dev/null
+++ b/solr/licenses/http2-server-10.0.12.jar.sha1
@@ -0,0 +1 @@
+af41265e4775652dc3260598b326bf9da506b52f
diff --git a/solr/licenses/http2-server-9.4.48.v20220622.jar.sha1 b/solr/licenses/http2-server-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 7f692a8cb75..00000000000
--- a/solr/licenses/http2-server-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4f417e525a533fedfdb891331c5c8ccfcb12b263
diff --git a/solr/licenses/jakarta.el-3.0.3.jar.sha1 b/solr/licenses/jakarta.el-3.0.3.jar.sha1
deleted file mode 100644
index cf7eb179210..00000000000
--- a/solr/licenses/jakarta.el-3.0.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dab46ee1ee23f7197c13d7c40fce14817c9017df
diff --git a/solr/licenses/jakarta.el-LICENSE-EPL.txt b/solr/licenses/jakarta.el-LICENSE-EPL.txt
deleted file mode 100644
index bda7db00c56..00000000000
--- a/solr/licenses/jakarta.el-LICENSE-EPL.txt
+++ /dev/null
@@ -1,277 +0,0 @@
-# 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.
diff --git a/solr/licenses/jakarta.el-NOTICE.txt b/solr/licenses/jakarta.el-NOTICE.txt
deleted file mode 100644
index 9e121fdeb1c..00000000000
--- a/solr/licenses/jakarta.el-NOTICE.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-# Notices for Jakarta Expression Language
-
-This content is produced and maintained by the Jakarta Expression Language project.
-
-* Project home: https://projects.eclipse.org/projects/ee4j.el
-
-## Trademarks
-
-Jakarta Expression Language is a trademark of the Eclipse
-Foundation.
-
-## Copyright
-
-All content is the property of the respective authors or their employers. For
-more information regarding authorship of content, please consult the listed
-source code repository logs.
-
-## Declared Project Licenses
-
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v. 2.0 which is available at
-http://www.eclipse.org/legal/epl-2.0. 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: GNU
-General Public License, version 2 with the GNU Classpath Exception which is
-available at https://www.gnu.org/software/classpath/license.html.
-
-SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
-## Source Code
-
-The project maintains the following source code repositories:
-
-* https://github.com/eclipse-ee4j/el-ri
-
-## Third-party Content
-
-## Cryptography
-
-Content may contain encryption software. The country in which you are currently
-may have restrictions on the import, possession, and use, and/or re-export to
-another country, of encryption software. BEFORE using any encryption software,
-please check the country's laws, regulations and policies concerning the import,
-possession, or use, and re-export of encryption software, to see if this is
-permitted.
diff --git a/solr/licenses/javax.servlet-api-3.1.0.jar.sha1 b/solr/licenses/javax.servlet-api-3.1.0.jar.sha1
deleted file mode 100644
index a269ca04f74..00000000000
--- a/solr/licenses/javax.servlet-api-3.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3cd63d075497751784b2fa84be59432f4905bf7c
diff --git a/solr/licenses/javax.servlet-api-LICENSE-CDDL.txt b/solr/licenses/javax.servlet-api-LICENSE-CDDL.txt
deleted file mode 100644
index b75b04fcf9c..00000000000
--- a/solr/licenses/javax.servlet-api-LICENSE-CDDL.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
- 1.1. Contributor. means each individual or entity that creates or contributes to the creation of Modifications.
-
- 1.2. Contributor Version. means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
-
- 1.3. Covered Software. means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
-
- 1.4. Executable. means the Covered Software in any form other than Source Code.
-
- 1.5. Initial Developer. means the individual or entity that first makes Original Software available under this License.
-
- 1.6. Larger Work. means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
-
- 1.7. License. means this document.
-
- 1.8. Licensable. means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-
- 1.9. Modifications. means the Source Code and Executable form of any of the following:
-
- A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
-
- B. Any new file that contains any part of the Original Software or previous Modification; or
-
- C. Any new file that is contributed or otherwise made available under the terms of this License.
-
- 1.10. Original Software. means the Source Code and Executable form of computer software code that is originally released under this License.
-
- 1.11. Patent Claims. means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-
- 1.12. Source Code. means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
-
- 1.13. You. (or .Your.) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, .You. includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, .control. means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outs [...]
-
-2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-
- (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that [...]
-
-3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
- Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Soft [...]
-
- 3.2. Modifications.
- The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
-
- 3.3. Required Notices.
- You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms.
- You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients. rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that an [...]
-
- 3.5. Distribution of Executable Versions.
- You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient.s rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable [...]
-
- 3.6. Larger Works.
- You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
- 4.1. New Versions.
- Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
-
- 4.2. Effect of New Versions.
- You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under [...]
-
- 4.3. Modified Versions.
- When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME [...]
-
-6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as .Participant.) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rig [...]
-
- 6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND AL [...]
-
-8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a .commercial item,. as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial computer software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth [...]
-
-9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction.s conflict-of-law provisions. Any litigati [...]
-
-10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-
- NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-
- The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
-
-
diff --git a/solr/licenses/javax.servlet-api-NOTICE.txt b/solr/licenses/javax.servlet-api-NOTICE.txt
deleted file mode 100644
index 6340ec9b796..00000000000
--- a/solr/licenses/javax.servlet-api-NOTICE.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Servlet-api.jar is under the CDDL license, the original source
-code for this can be found at http://www.eclipse.org/jetty/downloads.php
diff --git a/solr/licenses/jcl-over-slf4j-1.7.36.jar.sha1 b/solr/licenses/jcl-over-slf4j-1.7.36.jar.sha1
deleted file mode 100644
index 6cc486b4a1b..00000000000
--- a/solr/licenses/jcl-over-slf4j-1.7.36.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d877e195a05aca4a2f1ad2ff14bfec1393af4b5e
diff --git a/solr/licenses/jcl-over-slf4j-2.0.3.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.3.jar.sha1
new file mode 100644
index 00000000000..77667e30a7d
--- /dev/null
+++ b/solr/licenses/jcl-over-slf4j-2.0.3.jar.sha1
@@ -0,0 +1 @@
+37bffdfe4b74a2f89d3a90a791f481a9752f2308
diff --git a/solr/licenses/jetty-alpn-client-10.0.12.jar.sha1 b/solr/licenses/jetty-alpn-client-10.0.12.jar.sha1
new file mode 100644
index 00000000000..53a0f54122c
--- /dev/null
+++ b/solr/licenses/jetty-alpn-client-10.0.12.jar.sha1
@@ -0,0 +1 @@
+64a996622b70ca1822b87cf74895741f2a0feb27
diff --git a/solr/licenses/jetty-alpn-client-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-alpn-client-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 3fa72b8ef8e..00000000000
--- a/solr/licenses/jetty-alpn-client-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b224008b51c94e9440367e2af67a0fcbbdae943b
diff --git a/solr/licenses/jetty-alpn-java-client-10.0.12.jar.sha1 b/solr/licenses/jetty-alpn-java-client-10.0.12.jar.sha1
new file mode 100644
index 00000000000..2aeb1b4a92e
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-client-10.0.12.jar.sha1
@@ -0,0 +1 @@
+01ab638fc21dc6ee2fcf8494141593f0e582be88
diff --git a/solr/licenses/jetty-alpn-java-client-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-alpn-java-client-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 8e6dcbe52a0..00000000000
--- a/solr/licenses/jetty-alpn-java-client-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e82cb053fdbd274b7be469f408675428bb849dea
diff --git a/solr/licenses/jetty-alpn-java-server-10.0.12.jar.sha1 b/solr/licenses/jetty-alpn-java-server-10.0.12.jar.sha1
new file mode 100644
index 00000000000..457fad8a5a3
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-server-10.0.12.jar.sha1
@@ -0,0 +1 @@
+d267f462bdefd87068b5821c4a12dbe36c820d28
diff --git a/solr/licenses/jetty-alpn-java-server-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-alpn-java-server-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 498ab0849e3..00000000000
--- a/solr/licenses/jetty-alpn-java-server-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5260dcfac217ce3b5e7b6bbf58b6f350ed6e4f00
diff --git a/solr/licenses/jetty-alpn-server-10.0.12.jar.sha1 b/solr/licenses/jetty-alpn-server-10.0.12.jar.sha1
new file mode 100644
index 00000000000..f518584c369
--- /dev/null
+++ b/solr/licenses/jetty-alpn-server-10.0.12.jar.sha1
@@ -0,0 +1 @@
+355d0d53a5ec07076b3e3060fd0220c35eb2cde3
diff --git a/solr/licenses/jetty-alpn-server-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-alpn-server-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 2eb2f556775..00000000000
--- a/solr/licenses/jetty-alpn-server-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ed4427d8748b15a0be8d0181e77f434d30b8db8e
diff --git a/solr/licenses/jetty-client-10.0.12.jar.sha1 b/solr/licenses/jetty-client-10.0.12.jar.sha1
new file mode 100644
index 00000000000..024b4b8af2b
--- /dev/null
+++ b/solr/licenses/jetty-client-10.0.12.jar.sha1
@@ -0,0 +1 @@
+ded01fa2f7bff4a25e5627663718abcf255f2067
diff --git a/solr/licenses/jetty-client-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-client-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 3418425cc0b..00000000000
--- a/solr/licenses/jetty-client-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fc2e953a7030045e1ca467d57e200856a170848e
diff --git a/solr/licenses/jetty-continuation-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-continuation-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 14dc08bb7af..00000000000
--- a/solr/licenses/jetty-continuation-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2da1287dfc76d01418cc4b716d20154941b841ed
diff --git a/solr/licenses/jetty-deploy-10.0.12.jar.sha1 b/solr/licenses/jetty-deploy-10.0.12.jar.sha1
new file mode 100644
index 00000000000..14188185ad7
--- /dev/null
+++ b/solr/licenses/jetty-deploy-10.0.12.jar.sha1
@@ -0,0 +1 @@
+3ccc1e6e492032c9bfd9f8f271cd2a6eca579bf5
diff --git a/solr/licenses/jetty-deploy-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-deploy-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 90e395bee04..00000000000
--- a/solr/licenses/jetty-deploy-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-552bf16b9f698bc44453af3269750de15117496d
diff --git a/solr/licenses/jetty-http-10.0.12.jar.sha1 b/solr/licenses/jetty-http-10.0.12.jar.sha1
new file mode 100644
index 00000000000..813000ab7d6
--- /dev/null
+++ b/solr/licenses/jetty-http-10.0.12.jar.sha1
@@ -0,0 +1 @@
+e8f5483971a0ddb6d44934b888c0fcc2584874ce
diff --git a/solr/licenses/jetty-http-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-http-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 41650bd2c91..00000000000
--- a/solr/licenses/jetty-http-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8cb235e70bda0c5e97a41e7ee0ea33ee7f5bcc6a
diff --git a/solr/licenses/jetty-io-10.0.12.jar.sha1 b/solr/licenses/jetty-io-10.0.12.jar.sha1
new file mode 100644
index 00000000000..fb34fb5df64
--- /dev/null
+++ b/solr/licenses/jetty-io-10.0.12.jar.sha1
@@ -0,0 +1 @@
+183c90feb4c9cbbf4962ae9566144a35dc1a38c0
diff --git a/solr/licenses/jetty-io-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-io-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index e5b636919d4..00000000000
--- a/solr/licenses/jetty-io-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b09b55209d0a304e542f779750a01f6914dc55e7
diff --git a/solr/licenses/jetty-jmx-10.0.12.jar.sha1 b/solr/licenses/jetty-jmx-10.0.12.jar.sha1
new file mode 100644
index 00000000000..008c02a5b29
--- /dev/null
+++ b/solr/licenses/jetty-jmx-10.0.12.jar.sha1
@@ -0,0 +1 @@
+38a87e99a4d2ac3c01c11e657d1b800fb8cccde2
diff --git a/solr/licenses/jetty-jmx-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-jmx-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 936f5ee4ee8..00000000000
--- a/solr/licenses/jetty-jmx-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c7dcca458ec5b00e3270722821d96c2d0ea38024
diff --git a/solr/licenses/jetty-rewrite-10.0.12.jar.sha1 b/solr/licenses/jetty-rewrite-10.0.12.jar.sha1
new file mode 100644
index 00000000000..1c7a4f9ed1b
--- /dev/null
+++ b/solr/licenses/jetty-rewrite-10.0.12.jar.sha1
@@ -0,0 +1 @@
+efdf88f3413d66abd0e337fbbbf51fc638ca5c59
diff --git a/solr/licenses/jetty-rewrite-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-rewrite-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index dd3816b51ab..00000000000
--- a/solr/licenses/jetty-rewrite-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d07d2acccf6626e23e2583c51067cd3cbb54ac27
diff --git a/solr/licenses/jetty-security-10.0.12.jar.sha1 b/solr/licenses/jetty-security-10.0.12.jar.sha1
new file mode 100644
index 00000000000..04b3a95b505
--- /dev/null
+++ b/solr/licenses/jetty-security-10.0.12.jar.sha1
@@ -0,0 +1 @@
+878c018df33aea5f185403e6881da29624207395
diff --git a/solr/licenses/jetty-security-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-security-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 8a4e7ba9b57..00000000000
--- a/solr/licenses/jetty-security-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6114f92529e9cff489528e6be77b48526a92d577
diff --git a/solr/licenses/jetty-server-10.0.12.jar.sha1 b/solr/licenses/jetty-server-10.0.12.jar.sha1
new file mode 100644
index 00000000000..7cf30089b09
--- /dev/null
+++ b/solr/licenses/jetty-server-10.0.12.jar.sha1
@@ -0,0 +1 @@
+941e18d6db785a32f857eabc29cea51e5ca38310
diff --git a/solr/licenses/jetty-server-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-server-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 8954b7aaec5..00000000000
--- a/solr/licenses/jetty-server-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b91a0641cda31c93962503b88f783602d2bd8093
diff --git a/solr/licenses/jetty-servlet-10.0.12.jar.sha1 b/solr/licenses/jetty-servlet-10.0.12.jar.sha1
new file mode 100644
index 00000000000..27d0fe125f9
--- /dev/null
+++ b/solr/licenses/jetty-servlet-10.0.12.jar.sha1
@@ -0,0 +1 @@
+642743b2074b1c40ee14e634cee436275b84e3cf
diff --git a/solr/licenses/jetty-servlet-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-servlet-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index a53f81bc8c2..00000000000
--- a/solr/licenses/jetty-servlet-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8a9a53e0aad3f194a4cc9940f7e9d5619254bf62
diff --git a/solr/licenses/jetty-servlet-api-4.0.6.jar.sha1 b/solr/licenses/jetty-servlet-api-4.0.6.jar.sha1
new file mode 100644
index 00000000000..5293c068a34
--- /dev/null
+++ b/solr/licenses/jetty-servlet-api-4.0.6.jar.sha1
@@ -0,0 +1 @@
+959c5d83d08f5cddf56caff749e48b735193191b
diff --git a/solr/licenses/jetty-servlets-10.0.12.jar.sha1 b/solr/licenses/jetty-servlets-10.0.12.jar.sha1
new file mode 100644
index 00000000000..b1d7efbe04a
--- /dev/null
+++ b/solr/licenses/jetty-servlets-10.0.12.jar.sha1
@@ -0,0 +1 @@
+70ac0ea516402dc42a915d52c372f5b25f02aef4
diff --git a/solr/licenses/jetty-servlets-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-servlets-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index cd4db7cfcb1..00000000000
--- a/solr/licenses/jetty-servlets-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b113da58158c96d6dd8df440bb79c1c0b5e2056e
diff --git a/solr/licenses/jetty-start-10.0.12-shaded.jar.sha1 b/solr/licenses/jetty-start-10.0.12-shaded.jar.sha1
new file mode 100644
index 00000000000..2e44f290bb5
--- /dev/null
+++ b/solr/licenses/jetty-start-10.0.12-shaded.jar.sha1
@@ -0,0 +1 @@
+c8a9e45e0811819d766e66fbc6f811f9ca934a2c
diff --git a/solr/licenses/jetty-start-9.4.48.v20220622-shaded.jar.sha1 b/solr/licenses/jetty-start-9.4.48.v20220622-shaded.jar.sha1
deleted file mode 100644
index 4cb3bea8025..00000000000
--- a/solr/licenses/jetty-start-9.4.48.v20220622-shaded.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3458dc539d9d5f4be1205ea35950158849c86ee8
diff --git a/solr/licenses/jetty-util-10.0.12.jar.sha1 b/solr/licenses/jetty-util-10.0.12.jar.sha1
new file mode 100644
index 00000000000..00549c24feb
--- /dev/null
+++ b/solr/licenses/jetty-util-10.0.12.jar.sha1
@@ -0,0 +1 @@
+77ebff975f7c206aba60b91bc8650cc306d1439d
diff --git a/solr/licenses/jetty-util-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-util-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 3023979259e..00000000000
--- a/solr/licenses/jetty-util-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7efc06f7ec0ff33d8c219bcc8c7415280c103669
diff --git a/solr/licenses/jetty-util-ajax-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-util-ajax-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 9cca4a30652..00000000000
--- a/solr/licenses/jetty-util-ajax-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-def39454993d094df10b1689592d235e636d7dde
diff --git a/solr/licenses/jetty-webapp-10.0.12.jar.sha1 b/solr/licenses/jetty-webapp-10.0.12.jar.sha1
new file mode 100644
index 00000000000..1b454eec62a
--- /dev/null
+++ b/solr/licenses/jetty-webapp-10.0.12.jar.sha1
@@ -0,0 +1 @@
+27057710ade0db130e7790dbcd3911d6b66e1543
diff --git a/solr/licenses/jetty-webapp-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-webapp-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 921e5b6a6e2..00000000000
--- a/solr/licenses/jetty-webapp-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9317a8518674c54b5ed9ec5ece8fcad92af91802
diff --git a/solr/licenses/jetty-xml-10.0.12.jar.sha1 b/solr/licenses/jetty-xml-10.0.12.jar.sha1
new file mode 100644
index 00000000000..0461bdafd23
--- /dev/null
+++ b/solr/licenses/jetty-xml-10.0.12.jar.sha1
@@ -0,0 +1 @@
+fa06a9eeeb9b577bb262e5cfd4c39f6eaa013060
diff --git a/solr/licenses/jetty-xml-9.4.48.v20220622.jar.sha1 b/solr/licenses/jetty-xml-9.4.48.v20220622.jar.sha1
deleted file mode 100644
index 21a54c76b1c..00000000000
--- a/solr/licenses/jetty-xml-9.4.48.v20220622.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2c8b7ad6b64437a693cd30666f3def666aac8207
diff --git a/solr/licenses/jul-to-slf4j-1.7.36.jar.sha1 b/solr/licenses/jul-to-slf4j-1.7.36.jar.sha1
deleted file mode 100644
index 6350e3077c9..00000000000
--- a/solr/licenses/jul-to-slf4j-1.7.36.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ed46d81cef9c412a88caef405b58f93a678ff2ca
diff --git a/solr/licenses/jul-to-slf4j-2.0.3.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.3.jar.sha1
new file mode 100644
index 00000000000..c49e8baffed
--- /dev/null
+++ b/solr/licenses/jul-to-slf4j-2.0.3.jar.sha1
@@ -0,0 +1 @@
+8916d40acff0461bafb5b35e511cb4cc976b75b5
diff --git a/solr/licenses/log4j-1.2-api-2.17.2.jar.sha1 b/solr/licenses/log4j-1.2-api-2.17.2.jar.sha1
deleted file mode 100644
index 2dd3c76ebd0..00000000000
--- a/solr/licenses/log4j-1.2-api-2.17.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8101f657252de8b2b8fb88e2b7cc8854924bf978
diff --git a/solr/licenses/log4j-1.2-api-2.19.0.jar.sha1 b/solr/licenses/log4j-1.2-api-2.19.0.jar.sha1
new file mode 100644
index 00000000000..0568b12a5a3
--- /dev/null
+++ b/solr/licenses/log4j-1.2-api-2.19.0.jar.sha1
@@ -0,0 +1 @@
+0e8d839e89e44f06ed901bb8b681161ad3131fd5
diff --git a/solr/licenses/log4j-api-2.17.2.jar.sha1 b/solr/licenses/log4j-api-2.17.2.jar.sha1
deleted file mode 100644
index d7ec93b4be9..00000000000
--- a/solr/licenses/log4j-api-2.17.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f42d6afa111b4dec5d2aea0fe2197240749a4ea6
diff --git a/solr/licenses/log4j-api-2.19.0.jar.sha1 b/solr/licenses/log4j-api-2.19.0.jar.sha1
new file mode 100644
index 00000000000..dea51ab21ff
--- /dev/null
+++ b/solr/licenses/log4j-api-2.19.0.jar.sha1
@@ -0,0 +1 @@
+ea1b37f38c327596b216542bc636cfdc0b8036fa
diff --git a/solr/licenses/log4j-core-2.17.2.jar.sha1 b/solr/licenses/log4j-core-2.17.2.jar.sha1
deleted file mode 100644
index 046badad2eb..00000000000
--- a/solr/licenses/log4j-core-2.17.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fa43ba4467f5300b16d1e0742934149bfc5ac564
diff --git a/solr/licenses/log4j-core-2.19.0.jar.sha1 b/solr/licenses/log4j-core-2.19.0.jar.sha1
new file mode 100644
index 00000000000..c2931b29890
--- /dev/null
+++ b/solr/licenses/log4j-core-2.19.0.jar.sha1
@@ -0,0 +1 @@
+3b6eeb4de4c49c0fe38a4ee27188ff5fee44d0bb
diff --git a/solr/licenses/log4j-layout-template-json-2.17.2.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.17.2.jar.sha1
deleted file mode 100644
index 8ced41c0812..00000000000
--- a/solr/licenses/log4j-layout-template-json-2.17.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c308f9b898450f1a34be7cf21af370877587736f
diff --git a/solr/licenses/log4j-layout-template-json-2.19.0.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.19.0.jar.sha1
new file mode 100644
index 00000000000..98bbe28cc1b
--- /dev/null
+++ b/solr/licenses/log4j-layout-template-json-2.19.0.jar.sha1
@@ -0,0 +1 @@
+e86db7ff1fab823b44439f55655006e95548f774
diff --git a/solr/licenses/log4j-slf4j-impl-2.17.2.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.17.2.jar.sha1
deleted file mode 100644
index 6b7a15c6d4b..00000000000
--- a/solr/licenses/log4j-slf4j-impl-2.17.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0183f7c95fc981f3e97d008b363341343508848e
diff --git a/solr/licenses/log4j-slf4j-LICENSE-ASL.txt b/solr/licenses/log4j-slf4j2-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/log4j-slf4j-LICENSE-ASL.txt
rename to solr/licenses/log4j-slf4j2-LICENSE-ASL.txt
diff --git a/solr/licenses/log4j-slf4j-NOTICE.txt b/solr/licenses/log4j-slf4j2-NOTICE.txt
similarity index 100%
rename from solr/licenses/log4j-slf4j-NOTICE.txt
rename to solr/licenses/log4j-slf4j2-NOTICE.txt
diff --git a/solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1
new file mode 100644
index 00000000000..46e408e6b37
--- /dev/null
+++ b/solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1
@@ -0,0 +1 @@
+5c04bfdd63ce9dceb2e284b81e96b6a70010ee10
diff --git a/solr/licenses/log4j-web-2.17.2.jar.sha1 b/solr/licenses/log4j-web-2.17.2.jar.sha1
deleted file mode 100644
index da381547e5c..00000000000
--- a/solr/licenses/log4j-web-2.17.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-34e57f47b2c069e0205f8060e4df5d961765e5e4
diff --git a/solr/licenses/log4j-web-2.19.0.jar.sha1 b/solr/licenses/log4j-web-2.19.0.jar.sha1
new file mode 100644
index 00000000000..1f23fe59135
--- /dev/null
+++ b/solr/licenses/log4j-web-2.19.0.jar.sha1
@@ -0,0 +1 @@
+6933767a88b585bee0693e891795dba1256bfcbf
diff --git a/solr/licenses/metrics-core-4.1.5.jar.sha1 b/solr/licenses/metrics-core-4.1.5.jar.sha1
deleted file mode 100644
index 82c8604e5e3..00000000000
--- a/solr/licenses/metrics-core-4.1.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-59ecf2c49e55d218f9b2666e2d74fb64f8df7f0b
diff --git a/solr/licenses/metrics-core-4.2.12.jar.sha1 b/solr/licenses/metrics-core-4.2.12.jar.sha1
new file mode 100644
index 00000000000..1de8b5c88c9
--- /dev/null
+++ b/solr/licenses/metrics-core-4.2.12.jar.sha1
@@ -0,0 +1 @@
+25b3a0a32da943a30104630216abeccf4eeb9e81
diff --git a/solr/licenses/metrics-graphite-4.1.5.jar.sha1 b/solr/licenses/metrics-graphite-4.1.5.jar.sha1
deleted file mode 100644
index 9f24c1efda3..00000000000
--- a/solr/licenses/metrics-graphite-4.1.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7cbfdd9490006f5cab59acb7f81aa30370f22391
diff --git a/solr/licenses/metrics-graphite-4.2.12.jar.sha1 b/solr/licenses/metrics-graphite-4.2.12.jar.sha1
new file mode 100644
index 00000000000..6e4dada9b09
--- /dev/null
+++ b/solr/licenses/metrics-graphite-4.2.12.jar.sha1
@@ -0,0 +1 @@
+943e9b874364db842bb1a85f9b4d05f149691a1a
diff --git a/solr/licenses/metrics-jetty10-4.2.12.jar.sha1 b/solr/licenses/metrics-jetty10-4.2.12.jar.sha1
new file mode 100644
index 00000000000..0b2c38fa2e3
--- /dev/null
+++ b/solr/licenses/metrics-jetty10-4.2.12.jar.sha1
@@ -0,0 +1 @@
+85178b2cdd52226492e3341b0ad03851d42e6969
diff --git a/solr/licenses/metrics-jetty9-LICENSE-ASL.txt b/solr/licenses/metrics-jetty10-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/metrics-jetty9-LICENSE-ASL.txt
rename to solr/licenses/metrics-jetty10-LICENSE-ASL.txt
diff --git a/solr/licenses/metrics-jetty9-NOTICE.txt b/solr/licenses/metrics-jetty10-NOTICE.txt
similarity index 100%
rename from solr/licenses/metrics-jetty9-NOTICE.txt
rename to solr/licenses/metrics-jetty10-NOTICE.txt
diff --git a/solr/licenses/metrics-jetty9-4.1.5.jar.sha1 b/solr/licenses/metrics-jetty9-4.1.5.jar.sha1
deleted file mode 100644
index 337a2dfce04..00000000000
--- a/solr/licenses/metrics-jetty9-4.1.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5d4b545cb65b234b892145f223ea4c0cc73dfa07
diff --git a/solr/licenses/metrics-jmx-4.1.5.jar.sha1 b/solr/licenses/metrics-jmx-4.1.5.jar.sha1
deleted file mode 100644
index 2bb78afe2fd..00000000000
--- a/solr/licenses/metrics-jmx-4.1.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7cb3e3e5b5d1eb6ed89ce86a345d467a377fb95a
diff --git a/solr/licenses/metrics-jmx-4.2.12.jar.sha1 b/solr/licenses/metrics-jmx-4.2.12.jar.sha1
new file mode 100644
index 00000000000..cf6b4bc2dc0
--- /dev/null
+++ b/solr/licenses/metrics-jmx-4.2.12.jar.sha1
@@ -0,0 +1 @@
+fc1d861de6ab0ae46d0257b17d4129979597f41c
diff --git a/solr/licenses/metrics-jvm-4.1.5.jar.sha1 b/solr/licenses/metrics-jvm-4.1.5.jar.sha1
deleted file mode 100644
index 3ace83d3165..00000000000
--- a/solr/licenses/metrics-jvm-4.1.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-efef7549d3c635090e700f0cff8999aed55c0732
diff --git a/solr/licenses/metrics-jvm-4.2.12.jar.sha1 b/solr/licenses/metrics-jvm-4.2.12.jar.sha1
new file mode 100644
index 00000000000..8c804c96bfb
--- /dev/null
+++ b/solr/licenses/metrics-jvm-4.2.12.jar.sha1
@@ -0,0 +1 @@
+9f0b5bbdf50590453d362283f827136e65fb1040
diff --git a/solr/licenses/micrometer-core-1.5.14.jar.sha1 b/solr/licenses/micrometer-core-1.5.14.jar.sha1
deleted file mode 100644
index 573aac6443c..00000000000
--- a/solr/licenses/micrometer-core-1.5.14.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f5484b4a16b572bc5586d7cc8e20b99d5d090d43
diff --git a/solr/licenses/micrometer-core-1.7.12.jar.sha1 b/solr/licenses/micrometer-core-1.7.12.jar.sha1
new file mode 100644
index 00000000000..7fbe56d5602
--- /dev/null
+++ b/solr/licenses/micrometer-core-1.7.12.jar.sha1
@@ -0,0 +1 @@
+2a6df7cf6131216940f3ae64c0c6b290d77de0cd
diff --git a/solr/licenses/slf4j-api-1.7.36.jar.sha1 b/solr/licenses/slf4j-api-1.7.36.jar.sha1
deleted file mode 100644
index 828b7cf7e05..00000000000
--- a/solr/licenses/slf4j-api-1.7.36.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6c62681a2f655b49963a5983b8b0950a6120ae14
diff --git a/solr/licenses/slf4j-api-2.0.3.jar.sha1 b/solr/licenses/slf4j-api-2.0.3.jar.sha1
new file mode 100644
index 00000000000..bab0d5644c1
--- /dev/null
+++ b/solr/licenses/slf4j-api-2.0.3.jar.sha1
@@ -0,0 +1 @@
+deef7fc81f00bd5e6205bb097be1040b4094f007
diff --git a/solr/licenses/snakeyaml-1.26.jar.sha1 b/solr/licenses/snakeyaml-1.26.jar.sha1
deleted file mode 100644
index cc77c134b6e..00000000000
--- a/solr/licenses/snakeyaml-1.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a78a8747147d2c5807683e76ec2b633e95c14fe9
diff --git a/solr/licenses/snakeyaml-1.28.jar.sha1 b/solr/licenses/snakeyaml-1.28.jar.sha1
new file mode 100644
index 00000000000..879e89213e8
--- /dev/null
+++ b/solr/licenses/snakeyaml-1.28.jar.sha1
@@ -0,0 +1 @@
+7cae037c3014350c923776548e71c9feb7a69259
diff --git a/solr/licenses/spring-aop-5.2.15.RELEASE.jar.sha1 b/solr/licenses/spring-aop-5.2.15.RELEASE.jar.sha1
deleted file mode 100644
index b1ae5f1990c..00000000000
--- a/solr/licenses/spring-aop-5.2.15.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d49b7179890c624de0d13e057153dcda10b5b52f
diff --git a/solr/licenses/spring-aop-5.3.23.jar.sha1 b/solr/licenses/spring-aop-5.3.23.jar.sha1
new file mode 100644
index 00000000000..b9b6080f9e5
--- /dev/null
+++ b/solr/licenses/spring-aop-5.3.23.jar.sha1
@@ -0,0 +1 @@
+30d0034ba29178e98781d85f51a7eb709a628e9b
diff --git a/solr/licenses/spring-beans-5.2.15.RELEASE.jar.sha1 b/solr/licenses/spring-beans-5.2.15.RELEASE.jar.sha1
deleted file mode 100644
index a067a8b47aa..00000000000
--- a/solr/licenses/spring-beans-5.2.15.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7372138d9f4f3393990472db6d1c07603d5bb5dc
diff --git a/solr/licenses/spring-beans-5.3.23.jar.sha1 b/solr/licenses/spring-beans-5.3.23.jar.sha1
new file mode 100644
index 00000000000..82b616e0d43
--- /dev/null
+++ b/solr/licenses/spring-beans-5.3.23.jar.sha1
@@ -0,0 +1 @@
+3bdefbf6042ed742cbe16f27d2d14cca9096a606
diff --git a/solr/licenses/spring-boot-2.3.12.RELEASE.jar.sha1 b/solr/licenses/spring-boot-2.3.12.RELEASE.jar.sha1
deleted file mode 100644
index 638facfc870..00000000000
--- a/solr/licenses/spring-boot-2.3.12.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ca4bcf0486f829917e16098807f6848ca3009395
diff --git a/solr/licenses/spring-boot-2.5.14.jar.sha1 b/solr/licenses/spring-boot-2.5.14.jar.sha1
new file mode 100644
index 00000000000..263b6d90901
--- /dev/null
+++ b/solr/licenses/spring-boot-2.5.14.jar.sha1
@@ -0,0 +1 @@
+4d581ebadc5fda0ec2d4a70653fe89087bd55983
diff --git a/solr/licenses/spring-boot-actuator-2.3.12.RELEASE.jar.sha1 b/solr/licenses/spring-boot-actuator-2.3.12.RELEASE.jar.sha1
deleted file mode 100644
index c882a5904ce..00000000000
--- a/solr/licenses/spring-boot-actuator-2.3.12.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a5de144218fcbd24573641ced19565ac4cf5052f
diff --git a/solr/licenses/spring-boot-actuator-2.5.14.jar.sha1 b/solr/licenses/spring-boot-actuator-2.5.14.jar.sha1
new file mode 100644
index 00000000000..9292954d702
--- /dev/null
+++ b/solr/licenses/spring-boot-actuator-2.5.14.jar.sha1
@@ -0,0 +1 @@
+7d8e27b27011ff0d5be6d09d7c335fee2c9bf239
diff --git a/solr/licenses/spring-boot-actuator-autoconfigure-2.3.12.RELEASE.jar.sha1 b/solr/licenses/spring-boot-actuator-autoconfigure-2.3.12.RELEASE.jar.sha1
deleted file mode 100644
index 7cd15a5fc8a..00000000000
--- a/solr/licenses/spring-boot-actuator-autoconfigure-2.3.12.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5169e8c16abee4be9510336eb42507ce2e887456
diff --git a/solr/licenses/spring-boot-actuator-autoconfigure-2.5.14.jar.sha1 b/solr/licenses/spring-boot-actuator-autoconfigure-2.5.14.jar.sha1
new file mode 100644
index 00000000000..04f5cdb748e
--- /dev/null
+++ b/solr/licenses/spring-boot-actuator-autoconfigure-2.5.14.jar.sha1
@@ -0,0 +1 @@
+b6bbfcf903699302aba7446b541772a1eb208272
diff --git a/solr/licenses/spring-boot-autoconfigure-2.3.12.RELEASE.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-2.3.12.RELEASE.jar.sha1
deleted file mode 100644
index 33488ec6296..00000000000
--- a/solr/licenses/spring-boot-autoconfigure-2.3.12.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-733467af87a2db8c0564b19bced302948cb17dd2
diff --git a/solr/licenses/spring-boot-autoconfigure-2.5.14.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-2.5.14.jar.sha1
new file mode 100644
index 00000000000..954a37e9d37
--- /dev/null
+++ b/solr/licenses/spring-boot-autoconfigure-2.5.14.jar.sha1
@@ -0,0 +1 @@
+83a8477a3d150070792594dc3a72addc65de118e
diff --git a/solr/licenses/spring-boot-starter-2.3.12.RELEASE.jar.sha1 b/solr/licenses/spring-boot-starter-2.3.12.RELEASE.jar.sha1
deleted file mode 100644
index f90ca9db52b..00000000000
--- a/solr/licenses/spring-boot-starter-2.3.12.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-779aa86e6268f0ee823598b903c1c3edf5e121e9
diff --git a/solr/licenses/spring-boot-starter-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-2.5.14.jar.sha1
new file mode 100644
index 00000000000..29393666dae
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-2.5.14.jar.sha1
@@ -0,0 +1 @@
+932d4aba1c83f5bd0e5176dfd432ef1e6f874a9b
diff --git a/solr/licenses/spring-boot-starter-actuator-2.3.12.RELEASE.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-2.3.12.RELEASE.jar.sha1
deleted file mode 100644
index 938b7502cbc..00000000000
--- a/solr/licenses/spring-boot-starter-actuator-2.3.12.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1cc314ff764b724e4ffd182ce4025b0af747657c
diff --git a/solr/licenses/spring-boot-starter-actuator-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-2.5.14.jar.sha1
new file mode 100644
index 00000000000..8129f1851b2
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-actuator-2.5.14.jar.sha1
@@ -0,0 +1 @@
+cc4c81502b3507dc1694dcef09370d0e97d047de
diff --git a/solr/licenses/spring-boot-starter-jetty-2.3.12.RELEASE.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-2.3.12.RELEASE.jar.sha1
deleted file mode 100644
index 5633f25818d..00000000000
--- a/solr/licenses/spring-boot-starter-jetty-2.3.12.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5ec2214a17a783ce11560b54e686fdddbe0e47d3
diff --git a/solr/licenses/spring-boot-starter-jetty-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-2.5.14.jar.sha1
new file mode 100644
index 00000000000..27dd9d61726
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-jetty-2.5.14.jar.sha1
@@ -0,0 +1 @@
+17c20c40f0116ca6ce0fb478286e6064d2188dd0
diff --git a/solr/licenses/spring-boot-starter-json-2.3.12.RELEASE.jar.sha1 b/solr/licenses/spring-boot-starter-json-2.3.12.RELEASE.jar.sha1
deleted file mode 100644
index ad6b2fedc4e..00000000000
--- a/solr/licenses/spring-boot-starter-json-2.3.12.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e92b0fdcb403c385f952bce4ecf101f99718910
diff --git a/solr/licenses/spring-boot-starter-json-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-json-2.5.14.jar.sha1
new file mode 100644
index 00000000000..ca55546f289
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-json-2.5.14.jar.sha1
@@ -0,0 +1 @@
+24640eed89ce4705722d0a5e103cb3cce2fbf9a5
diff --git a/solr/licenses/spring-boot-starter-logging-2.3.12.RELEASE.jar.sha1 b/solr/licenses/spring-boot-starter-logging-2.3.12.RELEASE.jar.sha1
deleted file mode 100644
index c563b2f2280..00000000000
--- a/solr/licenses/spring-boot-starter-logging-2.3.12.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fcb7438dbf22cd772408c3c833a5c83fa58a00dd
diff --git a/solr/licenses/spring-boot-starter-logging-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-logging-2.5.14.jar.sha1
new file mode 100644
index 00000000000..e5a29f0b59c
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-logging-2.5.14.jar.sha1
@@ -0,0 +1 @@
+312e9c5f3476ccc6b809c227fdfe7a72cdbce592
diff --git a/solr/licenses/spring-boot-starter-web-2.3.12.RELEASE.jar.sha1 b/solr/licenses/spring-boot-starter-web-2.3.12.RELEASE.jar.sha1
deleted file mode 100644
index ba8653ffaad..00000000000
--- a/solr/licenses/spring-boot-starter-web-2.3.12.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a75d3ebc706dadfad350ce05ddf269d5897f651
diff --git a/solr/licenses/spring-boot-starter-web-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-web-2.5.14.jar.sha1
new file mode 100644
index 00000000000..f540a96a5f5
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-web-2.5.14.jar.sha1
@@ -0,0 +1 @@
+284d497a5786bae68ece94a22f9ca4a7b52ff0c5
diff --git a/solr/licenses/spring-context-5.2.15.RELEASE.jar.sha1 b/solr/licenses/spring-context-5.2.15.RELEASE.jar.sha1
deleted file mode 100644
index b39eb606638..00000000000
--- a/solr/licenses/spring-context-5.2.15.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d3532e12b522da949123e6bcfc158a57c212fa57
diff --git a/solr/licenses/spring-context-5.3.23.jar.sha1 b/solr/licenses/spring-context-5.3.23.jar.sha1
new file mode 100644
index 00000000000..5487c862696
--- /dev/null
+++ b/solr/licenses/spring-context-5.3.23.jar.sha1
@@ -0,0 +1 @@
+530b36b2ce2c9e471c6a260c3f181bcd20325a58
diff --git a/solr/licenses/spring-core-5.2.15.RELEASE.jar.sha1 b/solr/licenses/spring-core-5.2.15.RELEASE.jar.sha1
deleted file mode 100644
index fa2f23a07d2..00000000000
--- a/solr/licenses/spring-core-5.2.15.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7166224f67f657582f61cec48ab9ece7904b5c87
diff --git a/solr/licenses/spring-core-5.3.23.jar.sha1 b/solr/licenses/spring-core-5.3.23.jar.sha1
new file mode 100644
index 00000000000..1b83d4905c5
--- /dev/null
+++ b/solr/licenses/spring-core-5.3.23.jar.sha1
@@ -0,0 +1 @@
+91407dc1106ea423c44150f3da1a0b4f8e25e5ca
diff --git a/solr/licenses/spring-expression-5.2.15.RELEASE.jar.sha1 b/solr/licenses/spring-expression-5.2.15.RELEASE.jar.sha1
deleted file mode 100644
index 24d5eec6e87..00000000000
--- a/solr/licenses/spring-expression-5.2.15.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7737cac50a5d8ba7257d32aaa43d928cb71eef10
diff --git a/solr/licenses/spring-expression-5.3.23.jar.sha1 b/solr/licenses/spring-expression-5.3.23.jar.sha1
new file mode 100644
index 00000000000..7253c5b000c
--- /dev/null
+++ b/solr/licenses/spring-expression-5.3.23.jar.sha1
@@ -0,0 +1 @@
+3a676bf4b9bc42bd37ab5ad264acb6ceb63397a2
diff --git a/solr/licenses/spring-jcl-5.2.15.RELEASE.jar.sha1 b/solr/licenses/spring-jcl-5.2.15.RELEASE.jar.sha1
deleted file mode 100644
index 2eec1a7602f..00000000000
--- a/solr/licenses/spring-jcl-5.2.15.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a31152a33aede87326a1560ed2c4cd4d122aa517
diff --git a/solr/licenses/spring-jcl-5.3.23.jar.sha1 b/solr/licenses/spring-jcl-5.3.23.jar.sha1
new file mode 100644
index 00000000000..402338e1b64
--- /dev/null
+++ b/solr/licenses/spring-jcl-5.3.23.jar.sha1
@@ -0,0 +1 @@
+3c7eb5fcca67b611065f73ff4325e398f8b051a3
diff --git a/solr/licenses/spring-web-5.2.15.RELEASE.jar.sha1 b/solr/licenses/spring-web-5.2.15.RELEASE.jar.sha1
deleted file mode 100644
index 968bef5b8f3..00000000000
--- a/solr/licenses/spring-web-5.2.15.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-41748d8c4ba656b016805a4faa1a36d2417fd4b6
diff --git a/solr/licenses/spring-web-5.3.23.jar.sha1 b/solr/licenses/spring-web-5.3.23.jar.sha1
new file mode 100644
index 00000000000..9c7d6862d02
--- /dev/null
+++ b/solr/licenses/spring-web-5.3.23.jar.sha1
@@ -0,0 +1 @@
+0193f5276092d9cbe3222c63885b47ca7b2cce97
diff --git a/solr/licenses/spring-webmvc-5.2.15.RELEASE.jar.sha1 b/solr/licenses/spring-webmvc-5.2.15.RELEASE.jar.sha1
deleted file mode 100644
index 66fc6d75dc0..00000000000
--- a/solr/licenses/spring-webmvc-5.2.15.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a926f626e6e0bf2586f881d0cd3a8e3040136e0d
diff --git a/solr/licenses/spring-webmvc-5.3.23.jar.sha1 b/solr/licenses/spring-webmvc-5.3.23.jar.sha1
new file mode 100644
index 00000000000..5dc279b7ae2
--- /dev/null
+++ b/solr/licenses/spring-webmvc-5.3.23.jar.sha1
@@ -0,0 +1 @@
+b163527c275b0374371890c0b76c2a2a09f9804b
diff --git a/solr/licenses/tomcat-embed-el-9.0.63.jar.sha1 b/solr/licenses/tomcat-embed-el-9.0.63.jar.sha1
new file mode 100644
index 00000000000..2242a4e69c2
--- /dev/null
+++ b/solr/licenses/tomcat-embed-el-9.0.63.jar.sha1
@@ -0,0 +1 @@
+b595f0bdae0392c8b3c8592fea10023956a3f619
diff --git a/solr/licenses/tomcat-embed-el-LICENSE-ASL.txt b/solr/licenses/tomcat-embed-el-LICENSE-ASL.txt
new file mode 100644
index 00000000000..4c3277f2529
--- /dev/null
+++ b/solr/licenses/tomcat-embed-el-LICENSE-ASL.txt
@@ -0,0 +1,1143 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
+APACHE TOMCAT SUBCOMPONENTS:
+
+Apache Tomcat includes a number of subcomponents with separate copyright notices
+and license terms. Your use of these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+
+For the Eclipse JDT Core Batch Compiler (ecj-x.x.x.jar) component and the
+following Jakarta EE Schemas:
+- jakartaee_9.xsd
+- jakartaee_10.xsd
+- jakarta_web-services_2_0.xsd
+- jakarta_web-services_client_2_0.xsd
+- jsp_3_0.xsd
+- jsp_3_1.xsd
+- web-app_5_0.xsd
+- web-app_6_0.xsd
+- web-commonn_5_0.xsd
+- web-commonn_6_0.xsd
+- web-fragment_5_0.xsd
+- web-fragment_6_0.xsd
+- web-jsptaglibrary_3_0.xsd
+- web-jsptaglibrary_3_1.xsd
+
+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.
+
+
+For the Windows Installer component:
+
+ * All NSIS source code, plug-ins, documentation, examples, header files and
+ graphics, with the exception of the compression modules and where
+ otherwise noted, are licensed under the zlib/libpng license.
+ * The zlib compression module for NSIS is licensed under the zlib/libpng
+ license.
+ * The bzip2 compression module for NSIS is licensed under the bzip2 license.
+ * The lzma compression module for NSIS is licensed under the Common Public
+ License version 1.0.
+
+zlib/libpng license
+
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use of
+this software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
+the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim
+ that you wrote the original software. If you use this software in a
+ product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+bzip2 license
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ 2. The origin of this software must not be misrepresented; you must not claim
+ that you wrote the original software. If you use this software in a
+ product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 3. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 4. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
+
+Julian Seward, Cambridge, UK.
+
+jseward@acm.org
+Common Public License version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON 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 code and documentation
+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 additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"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,
+including all Contributors.
+
+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, in source code and object code form.
+
+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 and object code 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.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all 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 Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by
+that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor,
+and informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+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, 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, 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 a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such Recipient
+under this Agreement shall terminate as of the date such litigation is filed. In
+addition, 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.
+IBM is the initial Agreement Steward. IBM 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.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.
+
+Special exception for LZMA compression module
+
+Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for
+NSIS, expressly permit you to statically or dynamically link your code (or bind
+by name) to the files from the LZMA compression module for NSIS without
+subjecting your linked code to the terms of the Common Public license version
+1.0. Any modifications or additions to files from the LZMA compression module
+for NSIS, however, are subject to the terms of the Common Public License version
+1.0.
+
+
+For the following XML Schemas for Java EE Deployment Descriptors:
+ - javaee_5.xsd
+ - javaee_web_services_1_2.xsd
+ - javaee_web_services_client_1_2.xsd
+ - javaee_6.xsd
+ - javaee_web_services_1_3.xsd
+ - javaee_web_services_client_1_3.xsd
+ - jsp_2_2.xsd
+ - web-app_3_0.xsd
+ - web-common_3_0.xsd
+ - web-fragment_3_0.xsd
+ - javaee_7.xsd
+ - javaee_web_services_1_4.xsd
+ - javaee_web_services_client_1_4.xsd
+ - jsp_2_3.xsd
+ - web-app_3_1.xsd
+ - web-common_3_1.xsd
+ - web-fragment_3_1.xsd
+ - javaee_8.xsd
+ - web-app_4_0.xsd
+ - web-common_4_0.xsd
+ - web-fragment_4_0.xsd
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+ 1.1. Contributor. means each individual or entity that creates or contributes
+ to the creation of Modifications.
+
+ 1.2. Contributor Version. means the combination of the Original Software,
+ prior Modifications used by a Contributor (if any), and the
+ Modifications made by that particular Contributor.
+
+ 1.3. Covered Software. means (a) the Original Software, or (b) Modifications,
+ or (c) the combination of files containing Original Software with files
+ containing Modifications, in each case including portions thereof.
+
+ 1.4. Executable. means the Covered Software in any form other than Source
+ Code.
+
+ 1.5. Initial Developer. means the individual or entity that first makes
+ Original Software available under this License.
+
+ 1.6. Larger Work. means a work which combines Covered Software or portions
+ thereof with code not governed by the terms of this License.
+
+ 1.7. License. means this document.
+
+ 1.8. Licensable. means having the right to grant, to the maximum extent
+ possible, whether at the time of the initial grant or subsequently
+ acquired, any and all of the rights conveyed herein.
+
+ 1.9. Modifications. means the Source Code and Executable form of any of the
+ following:
+
+ A. Any file that results from an addition to, deletion from or
+ modification of the contents of a file containing Original Software
+ or previous Modifications;
+
+ B. Any new file that contains any part of the Original Software or
+ previous Modification; or
+
+ C. Any new file that is contributed or otherwise made available under
+ the terms of this License.
+
+ 1.10. Original Software. means the Source Code and Executable form of
+ computer software code that is originally released under this License.
+
+ 1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+ acquired, including without limitation, method, process, and apparatus
+ claims, in any patent Licensable by grantor.
+
+ 1.12. Source Code. means (a) the common form of computer software code in
+ which modifications are made and (b) associated documentation included
+ in or with such code.
+
+ 1.13. You. (or .Your.) means an individual or a legal entity exercising
+ rights under, and complying with all of the terms of, this License. For
+ legal entities, .You. includes any entity which controls, is controlled
+ by, or is under common control with You. For purposes of this
+ definition, .control. means (a) the power, direct or indirect, to cause
+ the direction or management of such entity, whether by contract or
+ otherwise, or (b) ownership of more than fifty percent (50%) of the
+ outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+ 2.1. The Initial Developer Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and subject to
+ third party intellectual property claims, the Initial Developer hereby
+ grants You a world-wide, royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by Initial Developer, to use, reproduce, modify, display,
+ perform, sublicense and distribute the Original Software (or
+ portions thereof), with or without Modifications, and/or as part of
+ a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using or selling of
+ Original Software, to make, have made, use, practice, sell, and
+ offer for sale, and/or otherwise dispose of the Original Software
+ (or portions thereof).
+
+ (c) The licenses granted in Sections 2.1(a) and (b) are effective on the
+ date Initial Developer first distributes or otherwise makes the
+ Original Software available to a third party under the terms of this
+ License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
+ (1) for code that You delete from the Original Software, or (2) for
+ infringements caused by: (i) the modification of the Original
+ Software, or (ii) the combination of the Original Software with
+ other software or devices.
+
+ 2.2. Contributor Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and subject to third
+ party intellectual property claims, each Contributor hereby grants You a
+ world-wide, royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by Contributor to use, reproduce, modify, display,
+ perform, sublicense and distribute the Modifications created by such
+ Contributor (or portions thereof), either on an unmodified basis,
+ with other Modifications, as Covered Software and/or as part of a
+ Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or selling of
+ Modifications made by that Contributor either alone and/or in
+ combination with its Contributor Version (or portions of such
+ combination), to make, use, sell, offer for sale, have made, and/or
+ otherwise dispose of: (1) Modifications made by that Contributor (or
+ portions thereof); and (2) the combination of Modifications made by
+ that Contributor with its Contributor Version (or portions of such
+ combination).
+
+ (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on
+ the date Contributor first distributes or otherwise makes the
+ Modifications available to a third party.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is granted:
+ (1) for any code that Contributor has deleted from the Contributor
+ Version; (2) for infringements caused by: (i) third party
+ modifications of Contributor Version, or (ii) the combination of
+ Modifications made by that Contributor with other software (except
+ as part of the Contributor Version) or other devices; or (3) under
+ Patent Claims infringed by Covered Software in the absence of
+ Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+ 3.1. Availability of Source Code.
+ Any Covered Software that You distribute or otherwise make available in
+ Executable form must also be made available in Source Code form and that
+ Source Code form must be distributed only under the terms of this License.
+ You must include a copy of this License with every copy of the Source Code
+ form of the Covered Software You distribute or otherwise make available.
+ You must inform recipients of any such Covered Software in Executable form
+ as to how they can obtain such Covered Software in Source Code form in a
+ reasonable manner on or through a medium customarily used for software
+ exchange.
+
+ 3.2. Modifications.
+ The Modifications that You create or to which You contribute are governed
+ by the terms of this License. You represent that You believe Your
+ Modifications are Your original creation(s) and/or You have sufficient
+ rights to grant the rights conveyed by this License.
+
+ 3.3. Required Notices.
+ You must include a notice in each of Your Modifications that identifies
+ You as the Contributor of the Modification. You may not remove or alter
+ any copyright, patent or trademark notices contained within the Covered
+ Software, or any notices of licensing or any descriptive text giving
+ attribution to any Contributor or the Initial Developer.
+
+ 3.4. Application of Additional Terms.
+ You may not offer or impose any terms on any Covered Software in Source
+ Code form that alters or restricts the applicable version of this License
+ or the recipients. rights hereunder. You may choose to offer, and to
+ charge a fee for, warranty, support, indemnity or liability obligations to
+ one or more recipients of Covered Software. However, you may do so only on
+ Your own behalf, and not on behalf of the Initial Developer or any
+ Contributor. You must make it absolutely clear that any such warranty,
+ support, indemnity or liability obligation is offered by You alone, and
+ You hereby agree to indemnify the Initial Developer and every Contributor
+ for any liability incurred by the Initial Developer or such Contributor as
+ a result of warranty, support, indemnity or liability terms You offer.
+
+ 3.5. Distribution of Executable Versions.
+ You may distribute the Executable form of the Covered Software under the
+ terms of this License or under the terms of a license of Your choice,
+ which may contain terms different from this License, provided that You are
+ in compliance with the terms of this License and that the license for the
+ Executable form does not attempt to limit or alter the recipient.s rights
+ in the Source Code form from the rights set forth in this License. If You
+ distribute the Covered Software in Executable form under a different
+ license, You must make it absolutely clear that any terms which differ
+ from this License are offered by You alone, not by the Initial Developer
+ or Contributor. You hereby agree to indemnify the Initial Developer and
+ every Contributor for any liability incurred by the Initial Developer or
+ such Contributor as a result of any such terms You offer.
+
+ 3.6. Larger Works.
+ You may create a Larger Work by combining Covered Software with other code
+ not governed by the terms of this License and distribute the Larger Work
+ as a single product. In such a case, You must make sure the requirements
+ of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+ 4.1. New Versions.
+ Sun Microsystems, Inc. is the initial license steward and may publish
+ revised and/or new versions of this License from time to time. Each
+ version will be given a distinguishing version number. Except as provided
+ in Section 4.3, no one other than the license steward has the right to
+ modify this License.
+
+ 4.2. Effect of New Versions.
+ You may always continue to use, distribute or otherwise make the Covered
+ Software available under the terms of the version of the License under
+ which You originally received the Covered Software. If the Initial
+ Developer includes a notice in the Original Software prohibiting it from
+ being distributed or otherwise made available under any subsequent version
+ of the License, You must distribute and make the Covered Software
+ available under the terms of the version of the License under which You
+ originally received the Covered Software. Otherwise, You may also choose
+ to use, distribute or otherwise make the Covered Software available under
+ the terms of any subsequent version of the License published by the
+ license steward.
+
+ 4.3. Modified Versions.
+ When You are an Initial Developer and You want to create a new license for
+ Your Original Software, You may create and use a modified version of this
+ License if You: (a) rename the license and remove any references to the
+ name of the license steward (except to note that the license differs from
+ this License); and (b) otherwise make it clear that the license contains
+ terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS, WITHOUT
+ WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
+ LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
+ MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK
+ AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD
+ ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL
+ DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+ SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
+ ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED
+ HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+ 6.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to
+ cure such breach within 30 days of becoming aware of the breach.
+ Provisions which, by their nature, must remain in effect beyond the
+ termination of this License shall survive.
+
+ 6.2. If You assert a patent infringement claim (excluding declaratory
+ judgment actions) against Initial Developer or a Contributor (the
+ Initial Developer or Contributor against whom You assert such claim
+ is referred to as .Participant.) alleging that the Participant
+ Software (meaning the Contributor Version where the Participant is a
+ Contributor or the Original Software where the Participant is the
+ Initial Developer) directly or indirectly infringes any patent, then
+ any and all rights granted directly or indirectly to You by such
+ Participant, the Initial Developer (if the Initial Developer is not
+ the Participant) and all Contributors under Sections 2.1 and/or 2.2
+ of this License shall, upon 60 days notice from Participant terminate
+ prospectively and automatically at the expiration of such 60 day
+ notice period, unless if within such 60 day period You withdraw Your
+ claim with respect to the Participant Software against such
+ Participant either unilaterally or pursuant to a written agreement
+ with Participant.
+
+ 6.3. In the event of termination under Sections 6.1 or 6.2 above, all end
+ user licenses that have been validly granted by You or any
+ distributor hereunder prior to termination (excluding licenses
+ granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+ NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
+ OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF
+ ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL,
+ INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+ LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE,
+ COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
+ LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR
+ DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S NEGLIGENCE TO THE EXTENT
+ APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
+ EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+ The Covered Software is a .commercial item,. as that term is defined in 48
+ C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+ that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and commercial
+ computer software documentation. as such terms are used in 48 C.F.R. 12.212
+ (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+ through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered
+ Software with only those rights set forth herein. This U.S. Government Rights
+ clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or
+ provision that addresses Government rights in computer software under this
+ License.
+
+9. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject matter
+ hereof. If any provision of this License is held to be unenforceable, such
+ provision shall be reformed only to the extent necessary to make it
+ enforceable. This License shall be governed by the law of the jurisdiction
+ specified in a notice contained within the Original Software (except to the
+ extent applicable law, if any, provides otherwise), excluding such
+ jurisdiction's conflict-of-law provisions. Any litigation relating to this
+ License shall be subject to the jurisdiction of the courts located in the
+ jurisdiction and venue specified in a notice contained within the Original
+ Software, with the losing party responsible for costs, including, without
+ limitation, court costs and reasonable attorneys. fees and expenses. The
+ application of the United Nations Convention on Contracts for the
+ International Sale of Goods is expressly excluded. Any law or regulation
+ which provides that the language of a contract shall be construed against
+ the drafter shall not apply to this License. You agree that You alone are
+ responsible for compliance with the United States export administration
+ regulations (and the export control laws and regulation of any other
+ countries) when You use, distribute or otherwise make available any Covered
+ Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is responsible
+ for claims and damages arising, directly or indirectly, out of its
+ utilization of rights under this License and You agree to work with Initial
+ Developer and Contributors to distribute such responsibility on an equitable
+ basis. Nothing herein is intended or shall be deemed to constitute any
+ admission of liability.
+
+ NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+ LICENSE (CDDL)
+
+ The code released under the CDDL shall be governed by the laws of the State
+ of California (excluding conflict-of-law provisions). Any litigation relating
+ to this License shall be subject to the jurisdiction of the Federal Courts of
+ the Northern District of California and the state courts of the State of
+ California, with venue lying in Santa Clara County, California.
+
diff --git a/solr/licenses/tomcat-embed-el-NOTICE.txt b/solr/licenses/tomcat-embed-el-NOTICE.txt
new file mode 100644
index 00000000000..74fd3c4580d
--- /dev/null
+++ b/solr/licenses/tomcat-embed-el-NOTICE.txt
@@ -0,0 +1,68 @@
+Apache Tomcat
+Copyright 1999-2022 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
+This software contains code derived from netty-native
+developed by the Netty project
+(https://netty.io, https://github.com/netty/netty-tcnative/)
+and from finagle-native developed at Twitter
+(https://github.com/twitter/finagle).
+
+This software contains code derived from jgroups-kubernetes
+developed by the JGroups project (http://www.jgroups.org/).
+
+The Windows Installer is built with the Nullsoft
+Scriptable Install System (NSIS), which is
+open source software. The original software and
+related information is available at
+http://nsis.sourceforge.net.
+
+Java compilation software for JSP pages is provided by the Eclipse
+JDT Core Batch Compiler component, which is open source software.
+The original software and related information is available at
+https://www.eclipse.org/jdt/core/.
+
+org.apache.tomcat.util.json.JSONParser.jj is a public domain javacc grammar
+for JSON written by Robert Fischer.
+https://github.com/RobertFischer/json-parser
+
+For portions of the Tomcat JNI OpenSSL API and the OpenSSL JSSE integration
+The org.apache.tomcat.jni and the org.apache.tomcat.net.openssl packages
+are derivative work originating from the Netty project and the finagle-native
+project developed at Twitter
+* Copyright 2014 The Netty Project
+* Copyright 2014 Twitter
+
+For portions of the Tomcat cloud support
+The org.apache.catalina.tribes.membership.cloud package contains derivative
+work originating from the jgroups project.
+https://github.com/jgroups-extras/jgroups-kubernetes
+Copyright 2002-2018 Red Hat Inc.
+
+The original XML Schemas for Java EE Deployment Descriptors:
+ - javaee_5.xsd
+ - javaee_web_services_1_2.xsd
+ - javaee_web_services_client_1_2.xsd
+ - javaee_6.xsd
+ - javaee_web_services_1_3.xsd
+ - javaee_web_services_client_1_3.xsd
+ - jsp_2_2.xsd
+ - web-app_3_0.xsd
+ - web-common_3_0.xsd
+ - web-fragment_3_0.xsd
+ - javaee_7.xsd
+ - javaee_web_services_1_4.xsd
+ - javaee_web_services_client_1_4.xsd
+ - jsp_2_3.xsd
+ - web-app_3_1.xsd
+ - web-common_3_1.xsd
+ - web-fragment_3_1.xsd
+ - javaee_8.xsd
+ - web-app_4_0.xsd
+ - web-common_4_0.xsd
+ - web-fragment_4_0.xsd
+
+may be obtained from:
+http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html
diff --git a/solr/modules/hadoop-auth/build.gradle b/solr/modules/hadoop-auth/build.gradle
index 47382984ef9..93d1ae6a4ba 100644
--- a/solr/modules/hadoop-auth/build.gradle
+++ b/solr/modules/hadoop-auth/build.gradle
@@ -36,7 +36,7 @@ dependencies {
implementation 'org.slf4j:slf4j-api'
- implementation 'javax.servlet:javax.servlet-api'
+ compileOnlyApi 'org.eclipse.jetty.toolchain:jetty-servlet-api'
implementation 'com.fasterxml.jackson.core:jackson-core'
implementation 'com.google.guava:guava'
diff --git a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/AttributeOnlyServletContext.java b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/AttributeOnlyServletContext.java
index 63018f76141..e6ca2b57073 100644
--- a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/AttributeOnlyServletContext.java
+++ b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/AttributeOnlyServletContext.java
@@ -73,6 +73,30 @@ class AttributeOnlyServletContext implements ServletContext {
return null;
}
+ @Override
+ public int getSessionTimeout() {
+ return 0;
+ }
+
+ @Override
+ public void setSessionTimeout(int sessionTimeout) {}
+
+ @Override
+ public String getRequestCharacterEncoding() {
+ return null;
+ }
+
+ @Override
+ public void setRequestCharacterEncoding(String encoding) {}
+
+ @Override
+ public String getResponseCharacterEncoding() {
+ return null;
+ }
+
+ @Override
+ public void setResponseCharacterEncoding(String encoding) {}
+
@Override
public SessionCookieConfig getSessionCookieConfig() {
return null;
@@ -252,6 +276,11 @@ class AttributeOnlyServletContext implements ServletContext {
return null;
}
+ @Override
+ public ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) {
+ return null;
+ }
+
@Override
public javax.servlet.ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) {
return null;
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 d98e9677a7a..128400ae954 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
@@ -36,10 +36,10 @@ public class Krb5HttpClientUtils {
public static void setup(Http2SolrClient http2Client, String principalName) {
HttpAuthenticationStore authenticationStore = new HttpAuthenticationStore();
authenticationStore.addAuthentication(createSPNEGOAuthentication(principalName));
- http2Client.getHttpClient().setAuthenticationStore(authenticationStore);
http2Client
.getProtocolHandlers()
.put(new WWWAuthenticationProtocolHandler(http2Client.getHttpClient()));
+ http2Client.setAuthenticationStore(authenticationStore);
}
private static SPNEGOAuthentication createSPNEGOAuthentication(String principalName) {
diff --git a/solr/modules/jwt-auth/build.gradle b/solr/modules/jwt-auth/build.gradle
index 280b1f60bb1..bac8c2ad8b3 100644
--- a/solr/modules/jwt-auth/build.gradle
+++ b/solr/modules/jwt-auth/build.gradle
@@ -37,10 +37,10 @@ dependencies {
implementation 'commons-io:commons-io'
implementation 'io.dropwizard.metrics:metrics-core'
- implementation 'javax.servlet:javax.servlet-api'
implementation 'org.apache.httpcomponents:httpclient'
implementation 'org.apache.httpcomponents:httpcore'
implementation 'org.eclipse.jetty:jetty-client'
+ implementation 'org.eclipse.jetty.toolchain:jetty-servlet-api'
implementation ('com.google.guava:guava') { transitive = false }
implementation 'org.slf4j:slf4j-api'
diff --git a/solr/modules/s3-repository/build.gradle b/solr/modules/s3-repository/build.gradle
index 1dfe43d5649..4660660c8f7 100644
--- a/solr/modules/s3-repository/build.gradle
+++ b/solr/modules/s3-repository/build.gradle
@@ -50,6 +50,8 @@ dependencies {
testImplementation 'junit:junit'
testImplementation 'software.amazon.awssdk:profiles'
+ testImplementation 'org.hamcrest:hamcrest'
+
testImplementation('com.adobe.testing:s3mock-junit4') {
// Don't pull in separate versions of these libs, just use what Solr already has
exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j'
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 3f3284c7eb3..6cc78f95e8d 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
@@ -54,7 +54,11 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {
@ClassRule
public static final S3MockRule S3_MOCK_RULE =
- S3MockRule.builder().silent().withInitialBuckets(BUCKET_NAME).build();
+ S3MockRule.builder()
+ .silent()
+ .withInitialBuckets(BUCKET_NAME)
+ .withSecureConnection(false)
+ .build();
/**
* Sent by {@link org.apache.solr.handler.ReplicationHandler}, ensure we don't choke on the bare
@@ -246,7 +250,7 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {
try (S3BackupRepository repo = getRepository()) {
// Open an index input on a file
- pushObject("/my-repo/content", content);
+ pushObject("my-repo/content", content);
IndexInput input = repo.openInput(new URI("s3://my-repo"), "content", IOContext.DEFAULT);
byte[] buffer = new byte[100];
@@ -278,7 +282,7 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {
String blank = " ".repeat(5 * BufferedIndexInput.BUFFER_SIZE);
String content = "This is the file " + blank + "content";
- pushObject("/content", content);
+ pushObject("content", content);
IndexInput input = repo.openInput(new URI("s3:///"), "content", IOContext.DEFAULT);
// Read twice the size of the internal buffer, so first bytes are not in the buffer anymore
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 48b94d6e86f..48c462da548 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
@@ -38,7 +38,11 @@ public class S3IncrementalBackupTest extends AbstractIncrementalBackupTest {
@ClassRule
public static final S3MockRule S3_MOCK_RULE =
- S3MockRule.builder().silent().withInitialBuckets(BUCKET_NAME).build();
+ S3MockRule.builder()
+ .silent()
+ .withInitialBuckets(BUCKET_NAME)
+ .withSecureConnection(false)
+ .build();
public static final String SOLR_XML =
"<solr>\n"
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 3fcd5a3d781..16189a10051 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
@@ -35,7 +35,7 @@ public class S3OutputStreamTest extends SolrTestCaseJ4 {
@ClassRule
public static final S3MockRule S3_MOCK_RULE =
- S3MockRule.builder().silent().withInitialBuckets(BUCKET).build();
+ S3MockRule.builder().silent().withInitialBuckets(BUCKET).withSecureConnection(false).build();
private S3Client s3;
diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.java
index 50b7b7179ef..125f7411432 100644
--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.java
+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.java
@@ -16,10 +16,13 @@
*/
package org.apache.solr.s3;
+import static org.hamcrest.Matchers.containsString;
+
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.Collections;
import org.apache.commons.io.IOUtils;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
/** Basic test that write data and read them through the S3 client. */
@@ -91,7 +94,8 @@ public class S3ReadWriteTest extends AbstractS3ClientTest {
"Getting length on a dir should throw exception",
S3Exception.class,
() -> client.length("/directory"));
- assertEquals("Path is Directory", exception.getMessage());
+ MatcherAssert.assertThat(
+ exception.getMessage(), exception.getMessage(), containsString("Path is Directory"));
}
/** Check various method throws the expected exception of a missing S3 key. */
diff --git a/solr/prometheus-exporter/build.gradle b/solr/prometheus-exporter/build.gradle
index 980b0256875..ef0b6e69568 100644
--- a/solr/prometheus-exporter/build.gradle
+++ b/solr/prometheus-exporter/build.gradle
@@ -42,7 +42,7 @@ dependencies {
runtimeOnly 'org.apache.logging.log4j:log4j-api'
runtimeOnly 'org.apache.logging.log4j:log4j-core'
- runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
+ runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl'
runtimeOnly 'com.lmax:disruptor'
testImplementation project(':solr:core')
diff --git a/solr/server/build.gradle b/solr/server/build.gradle
index 7ff587adea5..ee48d33545e 100644
--- a/solr/server/build.gradle
+++ b/solr/server/build.gradle
@@ -36,7 +36,6 @@ configurations {
}
dependencies {
- serverLib 'org.eclipse.jetty:jetty-continuation'
serverLib 'org.eclipse.jetty:jetty-deploy'
serverLib 'org.eclipse.jetty:jetty-http'
serverLib 'org.eclipse.jetty:jetty-io'
@@ -58,7 +57,7 @@ dependencies {
serverLib 'org.eclipse.jetty.http2:http2-common'
serverLib 'org.eclipse.jetty.http2:http2-hpack'
- serverLib 'javax.servlet:javax.servlet-api'
+ serverLib 'org.eclipse.jetty.toolchain:jetty-servlet-api'
libExt 'com.lmax:disruptor'
libExt 'org.slf4j:jcl-over-slf4j'
@@ -68,7 +67,7 @@ dependencies {
libExt 'org.apache.logging.log4j:log4j-api'
libExt 'org.apache.logging.log4j:log4j-core'
libExt 'org.apache.logging.log4j:log4j-layout-template-json'
- libExt 'org.apache.logging.log4j:log4j-slf4j-impl'
+ libExt 'org.apache.logging.log4j:log4j-slf4j2-impl'
libExt 'org.apache.logging.log4j:log4j-web'
libExt('io.dropwizard.metrics:metrics-core', {
@@ -77,7 +76,7 @@ dependencies {
libExt('io.dropwizard.metrics:metrics-graphite', {
exclude group: "com.rabbitmq", module: "amqp-client"
})
- libExt 'io.dropwizard.metrics:metrics-jetty9'
+ libExt 'io.dropwizard.metrics:metrics-jetty10'
libExt 'io.dropwizard.metrics:metrics-jvm'
libExt 'io.dropwizard.metrics:metrics-jmx'
diff --git a/solr/server/contexts/solr-jetty-context.xml b/solr/server/contexts/solr-jetty-context.xml
index 6392cd11b74..ac5820a5c0b 100644
--- a/solr/server/contexts/solr-jetty-context.xml
+++ b/solr/server/contexts/solr-jetty-context.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath"><Property name="hostContext" default="/solr"/></Set>
<Set name="war"><Property name="jetty.base"/>/solr-webapp/webapp</Set>
diff --git a/solr/server/etc/jetty-gzip.xml b/solr/server/etc/jetty-gzip.xml
index cb69edd9f6b..222e68f023d 100644
--- a/solr/server/etc/jetty-gzip.xml
+++ b/solr/server/etc/jetty-gzip.xml
@@ -12,20 +12,16 @@
<Arg>
<New id="GzipHandler" class="org.eclipse.jetty.server.handler.gzip.GzipHandler">
<Set name="minGzipSize"><Property name="jetty.gzip.minGzipSize" deprecated="gzip.minGzipSize" default="2048"/></Set>
- <Set name="checkGzExists"><Property name="jetty.gzip.checkGzExists" deprecated="gzip.checkGzExists" default="false"/></Set>
- <Set name="compressionLevel"><Property name="jetty.gzip.compressionLevel" deprecated="gzip.compressionLevel" default="-1"/></Set>
<Set name="inflateBufferSize"><Property name="jetty.gzip.inflateBufferSize" default="0"/></Set>
- <Set name="deflaterPoolCapacity"><Property name="jetty.gzip.deflaterPoolCapacity" default="-1"/></Set>
- <Set name="syncFlush"><Property name="jetty.gzip.syncFlush" default="false" /></Set>
-
- <Set name="excludedAgentPatterns">
- <Array type="String">
- <Item><Property name="jetty.gzip.excludedUserAgent" deprecated="gzip.excludedUserAgent" default=".*MSIE.6\.0.*"/></Item>
- </Array>
- </Set>
-
<Set name="includedMethodList"><Property name="jetty.gzip.includedMethodList" default="GET,POST" /></Set>
<Set name="excludedMethodList"><Property name="jetty.gzip.excludedMethodList" default="" /></Set>
+ <Set name="deflaterPool">
+ <New class="org.eclipse.jetty.util.compression.DeflaterPool">
+ <Arg type="int"><Property name="jetty.gzip.deflaterPool.capacity" deprecated="jetty.gzip.deflaterPoolCapacity" default="-1"/></Arg>
+ <Arg type="int"><Property name="jetty.gzip.deflaterPool.compressionLevel" deprecated="jetty.gzip.compressionLevel" default="-1"/></Arg>
+ <Arg type="boolean"><Property name="jetty.gzip.deflaterPool.noWrap" default="true"/></Arg>
+ </New>
+ </Set>
</New>
</Arg>
</Call>
diff --git a/solr/server/etc/jetty-http.xml b/solr/server/etc/jetty-http.xml
index 4793c1f3194..a226b2e99ba 100644
--- a/solr/server/etc/jetty-http.xml
+++ b/solr/server/etc/jetty-http.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
diff --git a/solr/server/etc/jetty-https.xml b/solr/server/etc/jetty-https.xml
index ab03ba4d867..6ef13f60c20 100644
--- a/solr/server/etc/jetty-https.xml
+++ b/solr/server/etc/jetty-https.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- ============================================================= -->
<!-- Configure a HTTPS connector. -->
diff --git a/solr/server/etc/jetty-requestlog.xml b/solr/server/etc/jetty-requestlog.xml
index 386f0b257a6..9560ca96542 100644
--- a/solr/server/etc/jetty-requestlog.xml
+++ b/solr/server/etc/jetty-requestlog.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- =========================================================== -->
<!-- Configure Request Log -->
diff --git a/solr/server/etc/jetty-ssl.xml b/solr/server/etc/jetty-ssl.xml
index 7292b7f3343..dda2f14e3ee 100644
--- a/solr/server/etc/jetty-ssl.xml
+++ b/solr/server/etc/jetty-ssl.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- ============================================================= -->
<!-- Configure a TLS (SSL) Context Factory -->
diff --git a/solr/server/etc/jetty.xml b/solr/server/etc/jetty.xml
index f2cf331d18e..7d3e904fca6 100644
--- a/solr/server/etc/jetty.xml
+++ b/solr/server/etc/jetty.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- =============================================================== -->
<!-- Configure the Jetty Server -->
@@ -30,7 +30,7 @@
<!-- for all configuration that may be set here. -->
<!-- =========================================================== -->
<Arg name="threadpool">
- <New id="threadpool" class="com.codahale.metrics.jetty9.InstrumentedQueuedThreadPool">
+ <New id="threadpool" class="io.dropwizard.metrics.jetty10.InstrumentedQueuedThreadPool">
<Arg name="registry">
<Call id="solrJettyMetricRegistry" name="getOrCreate" class="com.codahale.metrics.SharedMetricRegistries">
<Arg>solr.jetty</Arg>
@@ -178,7 +178,7 @@
</New>
</Item>
<Item>
- <New id="InstrumentedHandler" class="com.codahale.metrics.jetty9.InstrumentedHandler">
+ <New id="InstrumentedHandler" class="io.dropwizard.metrics.jetty10.InstrumentedHandler">
<Arg><Ref refid="solrJettyMetricRegistry"/></Arg>
<Set name="handler">
<New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
@@ -195,7 +195,7 @@
<!-- Set handler Collection Structure -->
<!-- =========================================================== -->
<Set name="handler">
- <Ref id="RewriteHandler"/>
+ <Ref refid="RewriteHandler"/>
</Set>
<!-- =========================================================== -->
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index abd4a1656c3..6e8029714be 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -30,6 +30,7 @@ dependencies {
implementation 'org.eclipse.jetty:jetty-http'
implementation 'org.eclipse.jetty:jetty-client'
implementation 'org.eclipse.jetty:jetty-util'
+ implementation 'org.eclipse.jetty:jetty-io'
runtimeOnly 'org.eclipse.jetty:jetty-alpn-java-client'
api('org.apache.httpcomponents:httpmime', {
@@ -60,7 +61,7 @@ dependencies {
testImplementation 'commons-io:commons-io'
- testImplementation 'javax.servlet:javax.servlet-api'
+ testImplementation 'org.eclipse.jetty.toolchain:jetty-servlet-api'
testImplementation 'org.eclipse.jetty:jetty-server'
testImplementation 'org.eclipse.jetty:jetty-servlet'
@@ -71,7 +72,7 @@ dependencies {
testImplementation('org.mockito:mockito-core', {
exclude group: "net.bytebuddy", module: "byte-buddy-agent"
})
- testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl", {
+ testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl", {
exclude group: "org.apache.logging.log4j", module: "log4j-api"
})
testImplementation 'org.apache.commons:commons-lang3'
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
new file mode 100644
index 00000000000..1d9452f9e85
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/AuthenticationStoreHolder.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.solr.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;
+
+public class AuthenticationStoreHolder implements AuthenticationStore {
+
+ private volatile AuthenticationStore authenticationStore;
+
+ public AuthenticationStoreHolder() {
+ this.authenticationStore = new HttpAuthenticationStore();
+ }
+
+ public AuthenticationStoreHolder(AuthenticationStore authenticationStore) {
+ this.authenticationStore = authenticationStore;
+ }
+
+ public void updateAuthenticationStore(AuthenticationStore authenticationStore) {
+ this.authenticationStore = authenticationStore;
+ }
+
+ @Override
+ public void addAuthentication(Authentication authentication) {
+ authenticationStore.addAuthentication(authentication);
+ }
+
+ @Override
+ public void removeAuthentication(Authentication authentication) {
+ authenticationStore.removeAuthentication(authentication);
+ }
+
+ @Override
+ public void clearAuthentications() {
+ authenticationStore.clearAuthentications();
+ }
+
+ @Override
+ public Authentication findAuthentication(String type, URI uri, String realm) {
+ return authenticationStore.findAuthentication(type, uri, realm);
+ }
+
+ @Override
+ public void addAuthenticationResult(Authentication.Result result) {
+ authenticationStore.addAuthenticationResult(result);
+ }
+
+ @Override
+ public void removeAuthenticationResult(Authentication.Result result) {
+ authenticationStore.removeAuthenticationResult(result);
+ }
+
+ @Override
+ public void clearAuthenticationResults() {
+ authenticationStore.clearAuthenticationResults();
+ }
+
+ @Override
+ public Authentication.Result findAuthenticationResult(URI uri) {
+ return authenticationStore.findAuthenticationResult(uri);
+ }
+}
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 a6e528cfc95..650215464c2 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
@@ -77,6 +77,7 @@ import org.apache.solr.common.util.Utils;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.HttpClientTransport;
import org.eclipse.jetty.client.ProtocolHandlers;
+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.http.HttpClientTransportOverHTTP;
@@ -95,6 +96,7 @@ import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.http2.client.HTTP2Client;
import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2;
+import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.BlockingArrayQueue;
import org.eclipse.jetty.util.Fields;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -142,6 +144,7 @@ public class Http2SolrClient extends SolrClient {
private boolean shutdownExecutor;
private final String basicAuthAuthorizationStr;
+ private AuthenticationStoreHolder authenticationStore;
protected Http2SolrClient(String serverBaseUrl, Builder builder) {
if (serverBaseUrl != null) {
@@ -224,16 +227,27 @@ public class Http2SolrClient extends SolrClient {
if (log.isDebugEnabled()) {
log.debug("Create Http2SolrClient with HTTP/1.1 transport");
}
- transport = new HttpClientTransportOverHTTP(2);
- httpClient =
- sslEnabled ? new HttpClient(transport, sslContextFactory) : new HttpClient(transport);
+
+ ClientConnector clientConnector = new ClientConnector();
+ clientConnector.setReuseAddress(true);
+ clientConnector.setSslContextFactory(sslContextFactory);
+ clientConnector.setSelectors(2);
+ transport = new HttpClientTransportOverHTTP(clientConnector);
+
+ httpClient = new HttpClient(transport);
+
if (builder.maxConnectionsPerHost != null)
httpClient.setMaxConnectionsPerDestination(builder.maxConnectionsPerHost);
} else {
log.debug("Create Http2SolrClient with HTTP/2 transport");
- HTTP2Client http2client = new HTTP2Client();
+ ClientConnector clientConnector = new ClientConnector();
+ clientConnector.setReuseAddress(true);
+ clientConnector.setSslContextFactory(sslContextFactory);
+ clientConnector.setSelectors(2);
+
+ HTTP2Client http2client = new HTTP2Client(clientConnector);
transport = new HttpClientTransportOverHTTP2(http2client);
- httpClient = new HttpClient(transport, sslContextFactory);
+ httpClient = new HttpClient(transport);
httpClient.setMaxConnectionsPerDestination(4);
}
@@ -244,9 +258,13 @@ public class Http2SolrClient extends SolrClient {
httpClient.setMaxRequestsQueuedPerDestination(
asyncTracker.getMaxRequestsQueuedPerDestination());
httpClient.setUserAgentField(new HttpField(HttpHeader.USER_AGENT, AGENT));
-
httpClient.setIdleTimeout(idleTimeout);
+
+ this.authenticationStore = new AuthenticationStoreHolder();
+ httpClient.setAuthenticationStore(this.authenticationStore);
+
if (builder.connectionTimeout != null) httpClient.setConnectTimeout(builder.connectionTimeout);
+
try {
httpClient.start();
} catch (Exception e) {
@@ -263,7 +281,6 @@ public class Http2SolrClient extends SolrClient {
asyncTracker.waitForComplete();
try {
if (closeClient) {
- httpClient.setStopTimeout(1000);
httpClient.stop();
httpClient.destroy();
}
@@ -278,6 +295,10 @@ public class Http2SolrClient extends SolrClient {
assert ObjectReleaseTracker.release(this);
}
+ public void setAuthenticationStore(AuthenticationStore authenticationStore) {
+ this.authenticationStore.updateAuthenticationStore(authenticationStore);
+ }
+
public boolean isV2ApiRequest(final SolrRequest<?> request) {
return request instanceof V2Request || request.getPath().contains("/____v2");
}
@@ -693,13 +714,13 @@ public class Http2SolrClient extends SolrClient {
for (ContentStream contentStream : streams) {
String contentType = contentStream.getContentType();
if (contentType == null) {
- contentType = BinaryResponseParser.BINARY_CONTENT_TYPE; // default
+ contentType = "multipart/form-data"; // default
}
String name = contentStream.getName();
if (name == null) {
name = "";
}
- HttpFields fields = new HttpFields();
+ HttpFields.Mutable fields = HttpFields.build(1);
fields.add(HttpHeader.CONTENT_TYPE, contentType);
content.addFilePart(
name,
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
index 8d75b9b6852..aec42d3395b 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
@@ -508,7 +508,7 @@ public class HttpSolrClient extends BaseHttpSolrClient {
for (ContentStream content : streams) {
String contentType = content.getContentType();
if (contentType == null) {
- contentType = BinaryResponseParser.BINARY_CONTENT_TYPE; // default
+ contentType = "multipart/form-data"; // default
}
String name = content.getName();
if (name == null) {
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 d6298b67e4a..79e30aa66ac 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
@@ -134,7 +134,7 @@ public class Krb5HttpClientBuilder implements HttpClientBuilderFactory {
public void setup(Http2SolrClient http2Client) {
HttpAuthenticationStore authenticationStore = new HttpAuthenticationStore();
authenticationStore.addAuthentication(createSPNEGOAuthentication());
- http2Client.getHttpClient().setAuthenticationStore(authenticationStore);
+ http2Client.setAuthenticationStore(authenticationStore);
http2Client
.getProtocolHandlers()
.put(new WWWAuthenticationProtocolHandler(http2Client.getHttpClient()));
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 fb323514b0e..b2d2d56922d 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
@@ -98,7 +98,7 @@ public class PreemptiveBasicAuthClientBuilderFactory implements HttpClientBuilde
HttpAuthenticationStore authenticationStore = new HttpAuthenticationStore();
authenticationStore.addAuthentication(
new SolrBasicAuthentication(basicAuthUser, basicAuthPass));
- client.getHttpClient().setAuthenticationStore(authenticationStore);
+ client.setAuthenticationStore(authenticationStore);
client.getProtocolHandlers().put(new WWWAuthenticationProtocolHandler(client.getHttpClient()));
client
.getProtocolHandlers()
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 73bf9a4082f..3b15b841818 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
@@ -19,12 +19,12 @@ package org.apache.solr.client.solrj.util;
import java.net.URI;
import java.nio.charset.StandardCharsets;
+import java.util.Base64;
import java.util.Locale;
import org.eclipse.jetty.client.api.Authentication;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.util.Attributes;
-import org.eclipse.jetty.util.B64Code;
/** BasicAuthentication that does not care about uri and realm */
public class SolrBasicAuthentication implements Authentication {
@@ -32,7 +32,10 @@ public class SolrBasicAuthentication implements Authentication {
private final String value;
public SolrBasicAuthentication(String user, String password) {
- this.value = "Basic " + B64Code.encode(user + ":" + password, StandardCharsets.ISO_8859_1);
+ this.value =
+ "Basic "
+ + Base64.getEncoder()
+ .encodeToString((user + ":" + password).getBytes(StandardCharsets.ISO_8859_1));
}
@Override
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index 76a182e37a1..4610cf1e185 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -56,13 +56,13 @@ dependencies {
implementation 'io.opentracing:opentracing-util'
implementation 'com.google.guava:guava'
implementation 'io.dropwizard.metrics:metrics-core'
- implementation 'io.dropwizard.metrics:metrics-jetty9'
+ implementation 'io.dropwizard.metrics:metrics-jetty10'
implementation 'commons-cli:commons-cli'
permitUnusedDeclared 'commons-cli:commons-cli'
implementation 'org.apache.httpcomponents:httpclient'
implementation 'org.apache.httpcomponents:httpcore'
- implementation 'javax.servlet:javax.servlet-api'
+ implementation 'org.eclipse.jetty.toolchain:jetty-servlet-api'
implementation 'org.eclipse.jetty:jetty-server'
api 'org.eclipse.jetty:jetty-servlet'
implementation 'org.eclipse.jetty:jetty-util'
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 172e3258f1d..6f9c20aac35 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
@@ -997,8 +997,8 @@ public class MiniSolrCloudCluster {
@Override
protected HandlerWrapper injectJettyHandlers(HandlerWrapper chain) {
metricRegistry = new MetricRegistry();
- com.codahale.metrics.jetty9.InstrumentedHandler metrics =
- new com.codahale.metrics.jetty9.InstrumentedHandler(metricRegistry);
+ io.dropwizard.metrics.jetty10.InstrumentedHandler metrics =
+ new io.dropwizard.metrics.jetty10.InstrumentedHandler(metricRegistry);
metrics.setHandler(chain);
return metrics;
}
diff --git a/versions.lock b/versions.lock
index fae096385df..f168572b939 100644
--- a/versions.lock
+++ b/versions.lock
@@ -9,7 +9,7 @@ com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
com.fasterxml.jackson:jackson-bom:2.13.4.20221013 (12 constraints: 07fa9222)
com.fasterxml.jackson.core:jackson-annotations:2.13.4 (10 constraints: 95be0c15)
com.fasterxml.jackson.core:jackson-core:2.13.4 (13 constraints: 3c026a27)
-com.fasterxml.jackson.core:jackson-databind:2.13.4.2 (18 constraints: 7663825e)
+com.fasterxml.jackson.core:jackson-databind:2.13.4.2 (18 constraints: 3a6455da)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.4 (1 constraints: ba0ea766)
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.4 (2 constraints: a624c1e0)
com.fasterxml.woodstox:woodstox-core:6.3.1 (3 constraints: b5283aba)
@@ -76,11 +76,11 @@ edu.ucar:httpservices:4.5.5 (2 constraints: 8f122834)
edu.ucar:netcdf4:4.5.5 (1 constraints: 650c0402)
edu.ucar:udunits:4.5.5 (1 constraints: 2b06034e)
edu.usc.ir:sentiment-analysis-parser:0.1 (1 constraints: fa0b50e9)
-io.dropwizard.metrics:metrics-core:4.1.5 (5 constraints: 2543e4c0)
-io.dropwizard.metrics:metrics-graphite:4.1.5 (1 constraints: 0c050736)
-io.dropwizard.metrics:metrics-jetty9:4.1.5 (1 constraints: 0c050736)
-io.dropwizard.metrics:metrics-jmx:4.1.5 (1 constraints: 0c050736)
-io.dropwizard.metrics:metrics-jvm:4.1.5 (1 constraints: 0c050736)
+io.dropwizard.metrics:metrics-core:4.2.12 (5 constraints: 384468fe)
+io.dropwizard.metrics:metrics-graphite:4.2.12 (1 constraints: 3b05413b)
+io.dropwizard.metrics:metrics-jetty10:4.2.12 (1 constraints: 3b05413b)
+io.dropwizard.metrics:metrics-jmx:4.2.12 (1 constraints: 3b05413b)
+io.dropwizard.metrics:metrics-jvm:4.2.12 (1 constraints: 3b05413b)
io.grpc:grpc-context:1.48.0 (2 constraints: 211d5126)
io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721)
io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936)
@@ -111,7 +111,6 @@ jakarta.validation:jakarta.validation-api:2.0.2 (1 constraints: fd10b6c3)
jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (10 constraints: c1cce3ec)
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (5 constraints: c45d665e)
javax.measure:unit-api:1.0 (5 constraints: 8e3e2cc5)
-javax.servlet:javax.servlet-api:3.1.0 (3 constraints: 75209943)
joda-time:joda-time:2.9.9 (4 constraints: eb1fe06a)
junit:junit:4.13.2 (9 constraints: d4aa559e)
net.arnx:jsonic:1.2.7 (2 constraints: db10d4d1)
@@ -158,12 +157,12 @@ org.apache.kerby:kerby-asn1:1.0.1 (1 constraints: fd0be9f4)
org.apache.kerby:kerby-config:1.0.1 (4 constraints: 4d3182b9)
org.apache.kerby:kerby-pkix:1.0.1 (1 constraints: 710bfce4)
org.apache.kerby:kerby-util:1.0.1 (2 constraints: 6518bdb6)
-org.apache.logging.log4j:log4j-1.2-api:2.17.2 (1 constraints: 3e05463b)
-org.apache.logging.log4j:log4j-api:2.17.2 (9 constraints: 886f1688)
-org.apache.logging.log4j:log4j-core:2.17.2 (5 constraints: 6f55c3ab)
-org.apache.logging.log4j:log4j-layout-template-json:2.17.2 (1 constraints: 3e05463b)
-org.apache.logging.log4j:log4j-slf4j-impl:2.17.2 (1 constraints: 3e05463b)
-org.apache.logging.log4j:log4j-web:2.17.2 (1 constraints: 3e05463b)
+org.apache.logging.log4j:log4j-1.2-api:2.19.0 (1 constraints: 3e054a3b)
+org.apache.logging.log4j:log4j-api:2.19.0 (9 constraints: ba6f36df)
+org.apache.logging.log4j:log4j-core:2.19.0 (4 constraints: 98447217)
+org.apache.logging.log4j:log4j-layout-template-json:2.19.0 (1 constraints: 3e054a3b)
+org.apache.logging.log4j:log4j-slf4j2-impl:2.19.0 (1 constraints: 3e054a3b)
+org.apache.logging.log4j:log4j-web:2.19.0 (1 constraints: 3e054a3b)
org.apache.lucene:lucene-analysis-common:9.4.1 (10 constraints: de9e685a)
org.apache.lucene:lucene-analysis-icu:9.4.1 (1 constraints: 10052536)
org.apache.lucene:lucene-analysis-kuromoji:9.4.1 (1 constraints: 10052536)
@@ -231,30 +230,29 @@ org.codehaus.janino:commons-compiler:3.1.8 (2 constraints: 2f1983ec)
org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)
org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
org.codelibs:jhighlight:1.1.0 (1 constraints: 590ce401)
-org.eclipse.jetty:jetty-alpn-client:9.4.48.v20220622 (2 constraints: 5025331d)
-org.eclipse.jetty:jetty-alpn-java-client:9.4.48.v20220622 (1 constraints: 7f07517d)
-org.eclipse.jetty:jetty-alpn-java-server:9.4.48.v20220622 (1 constraints: 7f07517d)
-org.eclipse.jetty:jetty-alpn-server:9.4.48.v20220622 (2 constraints: 211bb2dd)
-org.eclipse.jetty:jetty-client:9.4.48.v20220622 (2 constraints: 4b1fb13f)
-org.eclipse.jetty:jetty-continuation:9.4.48.v20220622 (3 constraints: cc332338)
-org.eclipse.jetty:jetty-deploy:9.4.48.v20220622 (1 constraints: 7f07517d)
-org.eclipse.jetty:jetty-http:9.4.48.v20220622 (5 constraints: 8649704d)
-org.eclipse.jetty:jetty-io:9.4.48.v20220622 (8 constraints: 077ef92c)
-org.eclipse.jetty:jetty-jmx:9.4.48.v20220622 (1 constraints: 7f07517d)
-org.eclipse.jetty:jetty-rewrite:9.4.48.v20220622 (1 constraints: 7f07517d)
-org.eclipse.jetty:jetty-security:9.4.48.v20220622 (2 constraints: e817f7dd)
-org.eclipse.jetty:jetty-server:9.4.48.v20220622 (7 constraints: 2a7af2e8)
-org.eclipse.jetty:jetty-servlet:9.4.48.v20220622 (2 constraints: 621757bf)
-org.eclipse.jetty:jetty-servlets:9.4.48.v20220622 (1 constraints: 7f07517d)
-org.eclipse.jetty:jetty-util:9.4.48.v20220622 (9 constraints: d490c7eb)
-org.eclipse.jetty:jetty-util-ajax:9.4.48.v20220622 (1 constraints: 6a106ee2)
-org.eclipse.jetty:jetty-webapp:9.4.48.v20220622 (2 constraints: 70175dc0)
-org.eclipse.jetty:jetty-xml:9.4.48.v20220622 (3 constraints: 5327b11f)
-org.eclipse.jetty.http2:http2-client:9.4.48.v20220622 (2 constraints: 4b1fb13f)
-org.eclipse.jetty.http2:http2-common:9.4.48.v20220622 (3 constraints: 212b1b1f)
-org.eclipse.jetty.http2:http2-hpack:9.4.48.v20220622 (2 constraints: 4e19575c)
-org.eclipse.jetty.http2:http2-http-client-transport:9.4.48.v20220622 (1 constraints: 7f07517d)
-org.eclipse.jetty.http2:http2-server:9.4.48.v20220622 (1 constraints: 7f07517d)
+org.eclipse.jetty:jetty-alpn-client:10.0.12 (3 constraints: e82e7c5e)
+org.eclipse.jetty:jetty-alpn-java-client:10.0.12 (2 constraints: 191bd36d)
+org.eclipse.jetty:jetty-alpn-java-server:10.0.12 (1 constraints: 66058e40)
+org.eclipse.jetty:jetty-alpn-server:10.0.12 (2 constraints: ef167048)
+org.eclipse.jetty:jetty-client:10.0.12 (2 constraints: 191bd36d)
+org.eclipse.jetty:jetty-deploy:10.0.12 (1 constraints: 66058e40)
+org.eclipse.jetty:jetty-http:10.0.12 (6 constraints: 634f5684)
+org.eclipse.jetty:jetty-io:10.0.12 (9 constraints: 997dcccf)
+org.eclipse.jetty:jetty-jmx:10.0.12 (1 constraints: 66058e40)
+org.eclipse.jetty:jetty-rewrite:10.0.12 (1 constraints: 66058e40)
+org.eclipse.jetty:jetty-security:10.0.12 (2 constraints: b6139778)
+org.eclipse.jetty:jetty-server:10.0.12 (7 constraints: bf6db614)
+org.eclipse.jetty:jetty-servlet:10.0.12 (2 constraints: 3013c660)
+org.eclipse.jetty:jetty-servlets:10.0.12 (1 constraints: 66058e40)
+org.eclipse.jetty:jetty-util:10.0.12 (9 constraints: 8c814f7b)
+org.eclipse.jetty:jetty-webapp:10.0.12 (2 constraints: 3e134e61)
+org.eclipse.jetty:jetty-xml:10.0.12 (3 constraints: 08213cb9)
+org.eclipse.jetty.http2:http2-client:10.0.12 (2 constraints: 191bd36d)
+org.eclipse.jetty.http2:http2-common:10.0.12 (3 constraints: d6243260)
+org.eclipse.jetty.http2:http2-hpack:10.0.12 (2 constraints: 1c15d5df)
+org.eclipse.jetty.http2:http2-http-client-transport:10.0.12 (1 constraints: 66058e40)
+org.eclipse.jetty.http2:http2-server:10.0.12 (1 constraints: 66058e40)
+org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 (4 constraints: 883053bf)
org.gagravarr:vorbis-java-core:0.8 (1 constraints: 010c57e9)
org.gagravarr:vorbis-java-tika:0.8 (1 constraints: 010c57e9)
org.glassfish.hk2:hk2-api:2.6.1 (2 constraints: 7811f501)
@@ -296,9 +294,9 @@ org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)
org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)
org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
org.semver4j:semver4j:2.2.0 (1 constraints: 0605fb35)
-org.slf4j:jcl-over-slf4j:1.7.36 (3 constraints: 05188eb8)
-org.slf4j:jul-to-slf4j:1.7.36 (3 constraints: 5928c263)
-org.slf4j:slf4j-api:1.7.36 (40 constraints: 08f98db1)
+org.slf4j:jcl-over-slf4j:2.0.3 (3 constraints: c91767a5)
+org.slf4j:jul-to-slf4j:2.0.3 (3 constraints: 23280547)
+org.slf4j:slf4j-api:2.0.3 (62 constraints: ac39a885)
org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
@@ -339,10 +337,10 @@ com.amazonaws:aws-java-sdk-s3:1.12.15 (1 constraints: e0125c30)
com.amazonaws:jmespath-java:1.12.15 (2 constraints: 501a5183)
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.4 (2 constraints: 601c12f1)
com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.4 (2 constraints: a719c812)
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4 (2 constraints: 09243482)
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4 (3 constraints: 773d9f0f)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4 (2 constraints: 0c243982)
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4 (3 constraints: 7d3d5a10)
com.fasterxml.jackson.module:jackson-module-kotlin:2.13.4 (2 constraints: a61d2f60)
-com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.4 (2 constraints: 09243482)
+com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.4 (2 constraints: 0c243982)
com.github.stephenc.jcip:jcip-annotations:1.0-1 (2 constraints: c5188bde)
com.google.cloud:google-cloud-nio:0.124.14 (1 constraints: c90e1c7b)
com.nimbusds:content-type:2.2 (1 constraints: d80b68eb)
@@ -354,7 +352,7 @@ com.squareup.okhttp3:okhttp:4.9.3 (1 constraints: 3f0f516d)
com.squareup.okio:okio:2.8.0 (1 constraints: 540c39fd)
io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871)
io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c)
-io.micrometer:micrometer-core:1.5.14 (1 constraints: fc161b19)
+io.micrometer:micrometer-core:1.7.12 (1 constraints: fc162119)
io.netty:netty-codec-http:4.1.82.Final (1 constraints: 59075f61)
io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b)
jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)
@@ -373,8 +371,8 @@ org.apache.kerby:kerb-common:1.0.1 (2 constraints: a51841ca)
org.apache.kerby:kerb-identity:1.0.1 (1 constraints: 5f0cb602)
org.apache.kerby:kerb-server:1.0.1 (1 constraints: d10b65f2)
org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: dc0d7e3e)
+org.apache.tomcat.embed:tomcat-embed-el:9.0.63 (1 constraints: d01553cf)
org.freemarker:freemarker:2.3.31 (1 constraints: ef0e9271)
-org.glassfish:jakarta.el:3.0.3 (1 constraints: 941562b9)
org.glassfish.grizzly:grizzly-framework:2.4.4 (1 constraints: 670fe271)
org.glassfish.grizzly:grizzly-http:2.4.4 (1 constraints: 2b127cf5)
org.glassfish.grizzly:grizzly-http-server:2.4.4 (2 constraints: bb2c391b)
@@ -397,24 +395,24 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 (2 constraints: 5e203d24)
org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
org.mockito:mockito-core:3.8.0 (1 constraints: 0d051236)
org.objenesis:objenesis:3.1 (1 constraints: b00a12bd)
-org.springframework:spring-aop:5.2.15.RELEASE (2 constraints: 32232d90)
-org.springframework:spring-beans:5.2.15.RELEASE (4 constraints: 5843b908)
-org.springframework:spring-context:5.2.15.RELEASE (2 constraints: c3236acf)
-org.springframework:spring-core:5.2.15.RELEASE (8 constraints: 5f8f7c09)
-org.springframework:spring-expression:5.2.15.RELEASE (2 constraints: 32232d90)
-org.springframework:spring-jcl:5.2.15.RELEASE (1 constraints: 7e109dcb)
-org.springframework:spring-web:5.2.15.RELEASE (3 constraints: e33f9fc2)
-org.springframework:spring-webmvc:5.2.15.RELEASE (1 constraints: 0817c84e)
-org.springframework.boot:spring-boot:2.3.12.RELEASE (4 constraints: 375ff6a1)
-org.springframework.boot:spring-boot-actuator:2.3.12.RELEASE (1 constraints: 9e1ba38d)
-org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.12.RELEASE (1 constraints: 281969da)
-org.springframework.boot:spring-boot-autoconfigure:2.3.12.RELEASE (2 constraints: 35316e29)
-org.springframework.boot:spring-boot-starter:2.3.12.RELEASE (3 constraints: a847adb4)
-org.springframework.boot:spring-boot-starter-actuator:2.3.12.RELEASE (1 constraints: a80fdfae)
-org.springframework.boot:spring-boot-starter-jetty:2.3.12.RELEASE (1 constraints: 1d0d3137)
-org.springframework.boot:spring-boot-starter-json:2.3.12.RELEASE (1 constraints: 03178f4e)
-org.springframework.boot:spring-boot-starter-logging:2.3.12.RELEASE (1 constraints: 98154deb)
-org.springframework.boot:spring-boot-starter-web:2.3.12.RELEASE (1 constraints: 1d0d3137)
-org.yaml:snakeyaml:1.26 (1 constraints: 0c13dd1f)
+org.springframework:spring-aop:5.3.23 (2 constraints: d41eae99)
+org.springframework:spring-beans:5.3.23 (4 constraints: 9c3abec4)
+org.springframework:spring-context:5.3.23 (2 constraints: 621fdbd1)
+org.springframework:spring-core:5.3.23 (8 constraints: e17dffad)
+org.springframework:spring-expression:5.3.23 (2 constraints: d41eae99)
+org.springframework:spring-jcl:5.3.23 (1 constraints: 4f0e9f4f)
+org.springframework:spring-web:5.3.23 (3 constraints: 5039958a)
+org.springframework:spring-webmvc:5.3.23 (1 constraints: d614689e)
+org.springframework.boot:spring-boot:2.5.14 (4 constraints: 8b564b45)
+org.springframework.boot:spring-boot-actuator:2.5.14 (1 constraints: 73199cb8)
+org.springframework.boot:spring-boot-actuator-autoconfigure:2.5.14 (1 constraints: fd162119)
+org.springframework.boot:spring-boot-autoconfigure:2.5.14 (2 constraints: df2c875d)
+org.springframework.boot:spring-boot-starter:2.5.14 (3 constraints: 274126c5)
+org.springframework.boot:spring-boot-starter-actuator:2.5.14 (1 constraints: a80fdfae)
+org.springframework.boot:spring-boot-starter-jetty:2.5.14 (1 constraints: 1d0d3137)
+org.springframework.boot:spring-boot-starter-json:2.5.14 (1 constraints: d814609e)
+org.springframework.boot:spring-boot-starter-logging:2.5.14 (1 constraints: 6d138546)
+org.springframework.boot:spring-boot-starter-web:2.5.14 (1 constraints: 1d0d3137)
+org.yaml:snakeyaml:1.28 (1 constraints: 0e13df1f)
software.amazon.awssdk:url-connection-client:2.17.63 (2 constraints: 471f19f7)
software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831)
diff --git a/versions.props b/versions.props
index 924e4ee0023..9d215dc6707 100644
--- a/versions.props
+++ b/versions.props
@@ -18,14 +18,13 @@ commons-cli:commons-cli=1.4
commons-codec:commons-codec=1.15
commons-collections:commons-collections=3.2.2
commons-io:commons-io=2.11.0
-io.dropwizard.metrics:*=4.1.5
+io.dropwizard.metrics:*=4.2.12
io.jaegertracing:*=1.8.1
io.netty:*=4.1.82.Final
io.opentracing:*=0.33.0
io.prometheus:*=0.2.0
io.swagger.core.v3:*=2.2.2
jakarta.ws.rs:jakarta.ws.rs-api=2.1.6
-javax.servlet:javax.servlet-api=3.1.0
joda-time:joda-time=2.9.9
junit:junit=4.13.2
net.arnx:jsonic=1.2.7
@@ -49,7 +48,7 @@ org.apache.httpcomponents:httpclient=4.5.13
org.apache.httpcomponents:httpcore=4.4.15
org.apache.httpcomponents:httpmime=4.5.13
org.apache.kerby:*=1.0.1
-org.apache.logging.log4j:*=2.17.2
+org.apache.logging.log4j:*=2.19.0
org.apache.lucene:*=9.4.1
org.apache.opennlp:opennlp-tools=1.9.4
org.apache.tika:*=1.28.4
@@ -57,7 +56,8 @@ org.apache.zookeeper:*=3.8.0
org.bitbucket.b_c:jose4j=0.7.9
org.carrot2:carrot2-core=4.4.3
org.codehaus.woodstox:stax2-api=4.2.1
-org.eclipse.jetty*:*=9.4.48.v20220622
+org.eclipse.jetty*:*=10.0.12
+org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.6
org.glassfish.hk2*:*=2.6.1
org.glassfish.jersey*:*=2.35
org.hamcrest:*=2.2
@@ -69,6 +69,8 @@ org.openjdk.jmh:*=1.32
org.osgi:osgi.annotation=8.1.0
org.quicktheories:quicktheories=0.26
org.semver4j:semver4j=2.2.0
-org.slf4j:*=1.7.36
+org.slf4j:*=2.0.3
+org.springframework.boot:spring-boot*=2.5.14
+org.springframework:spring*=5.3.23
org.xerial.snappy:snappy-java=1.1.7.6
software.amazon.awssdk:*=2.17.63