You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ge...@apache.org on 2022/10/21 17:17:00 UTC
[solr] branch branch_9x updated: SOLR-16347: Allow JAX-RS v2 API definitions
This is an automated email from the ASF dual-hosted git repository.
gerlowskija pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 62e3686d196 SOLR-16347: Allow JAX-RS v2 API definitions
62e3686d196 is described below
commit 62e3686d196ed0bb7a95bc2b25d6f4cd42d04bdb
Author: Jason Gerlowski <ge...@apache.org>
AuthorDate: Tue Sep 13 16:10:43 2022 -0400
SOLR-16347: Allow JAX-RS v2 API definitions
Converts ListConfigSetsAPI and SchemaNameAPI as examples.
---
...erxml.jackson.core.jackson-annotations.solr.txt | 2 -
solr/core/build.gradle | 17 +
.../src/java/org/apache/solr/api/ApiSupport.java | 14 +-
.../java/org/apache/solr/api/JerseyResource.java | 98 +++++
.../src/java/org/apache/solr/api/V2HttpCall.java | 156 +++----
.../java/org/apache/solr/core/CoreContainer.java | 27 +-
.../src/java/org/apache/solr/core/PluginBag.java | 45 +-
.../src/java/org/apache/solr/core/SolrCore.java | 10 +-
.../apache/solr/handler/RequestHandlerBase.java | 92 ++--
.../org/apache/solr/handler/SchemaHandler.java | 16 +-
.../solr/handler/admin/ConfigSetsHandler.java | 30 +-
.../solr/handler/admin/api/SchemaNameAPI.java | 52 ++-
.../org/apache/solr/handler/api/ApiRegistrar.java | 14 -
.../org/apache/solr/handler/api/V2ApiUtils.java | 56 +++
.../solr/handler/component/SearchHandler.java | 2 +-
.../solr/handler/configsets/ListConfigSetsAPI.java | 49 ++-
.../solr/jersey/CatchAllExceptionMapper.java | 131 ++++++
.../CoreContainerFactory.java} | 37 +-
.../api/V2ApiUtils.java => jersey/ErrorInfo.java} | 44 +-
.../solr/jersey/JacksonReflectMapWriter.java | 50 +++
.../org/apache/solr/jersey/JerseyApplications.java | 86 ++++
.../org/apache/solr/jersey/MessageBodyWriters.java | 134 ++++++
.../org/apache/solr/jersey/MetricBeanFactory.java | 55 +++
.../ApiSupport.java => jersey/PermissionName.java} | 39 +-
.../solr/jersey/PostRequestDecorationFilter.java | 59 +++
.../org/apache/solr/jersey/RequestContextKeys.java | 52 +++
.../apache/solr/jersey/RequestMetricHandling.java | 114 +++++
.../SolrCoreFactory.java} | 37 +-
.../SolrJacksonMapper.java} | 33 +-
.../org/apache/solr/jersey/SolrJerseyResponse.java | 62 +++
.../apache/solr/jersey/SolrRequestAuthorizer.java | 129 ++++++
.../jersey/container/ContainerRequestUtils.java | 139 ++++++
.../container/JettyBridgeResponseWriter.java | 109 +++++
.../container/package-info.java} | 37 +-
.../ApiSupport.java => jersey/package-info.java} | 28 +-
.../apache/solr/security/AuthorizationUtils.java | 157 +++++++
.../security/HttpServletAuthorizationContext.java | 90 ++++
.../java/org/apache/solr/servlet/HttpSolrCall.java | 157 ++-----
.../org/apache/solr/servlet/ResponseUtils.java | 56 +++
.../org/apache/solr/api/JerseyResourceTest.java | 55 +++
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 4 +-
.../test/org/apache/solr/core/PluginBagTest.java | 93 ++++
.../solr/handler/RequestHandlerBaseTest.java | 159 +++++++
.../apache/solr/handler/TestContainerPlugin.java | 11 +-
.../solr/handler/admin/TestApiFramework.java | 11 -
.../solr/handler/admin/api/SchemaNameAPITest.java | 85 ++++
.../handler/admin/api/V2SchemaAPIMappingTest.java | 2 -
.../handler/configsets/ListConfigSetsAPITest.java | 145 +++++++
.../solr/jersey/JacksonReflectMapWriterTest.java | 90 ++++
.../solr/security/AuditLoggerIntegrationTest.java | 19 +-
.../licenses/aopalliance-repackaged-2.6.1.jar.sha1 | 1 +
.../aopalliance-repackaged-LICENSE-EPL.txt | 277 ++++++++++++
solr/licenses/grizzly-framework-2.4.4.jar.sha1 | 1 +
solr/licenses/grizzly-framework-LICENSE-EPL.txt | 277 ++++++++++++
solr/licenses/grizzly-http-2.4.4.jar.sha1 | 1 +
solr/licenses/grizzly-http-LICENSE-EPL.txt | 277 ++++++++++++
solr/licenses/grizzly-http-server-2.4.4.jar.sha1 | 1 +
solr/licenses/grizzly-http-servlet-2.4.4.jar.sha1 | 1 +
solr/licenses/hk2-LICENSE-EPL.txt | 277 ++++++++++++
solr/licenses/hk2-api-2.6.1.jar.sha1 | 1 +
solr/licenses/hk2-locator-2.6.1.jar.sha1 | 1 +
solr/licenses/hk2-utils-2.6.1.jar.sha1 | 1 +
...ore-LICENSE-ASL.txt => jackson-LICENSE-ASL.txt} | 0
...n-annotations-NOTICE.txt => jackson-NOTICE.txt} | 0
solr/licenses/jackson-annotations-LICENSE-ASL.txt | 8 -
solr/licenses/jackson-core-NOTICE.txt | 20 -
solr/licenses/jackson-databind-LICENSE-ASL.txt | 8 -
solr/licenses/jackson-databind-NOTICE.txt | 20 -
.../jackson-dataformat-cbor-LICENSE-ASL.txt | 201 ---------
solr/licenses/jackson-dataformat-cbor-NOTICE.txt | 20 -
.../jackson-dataformat-smile-LICENSE-ASL.txt | 201 ---------
solr/licenses/jackson-dataformat-smile-NOTICE.txt | 20 -
solr/licenses/jackson-dataformat-xml-NOTICE.txt | 0
.../licenses/jackson-datatype-jdk8-LICENSE-ASL.txt | 201 ---------
solr/licenses/jackson-datatype-jdk8-NOTICE.txt | 0
.../jackson-datatype-jsr310-LICENSE-ASL.txt | 201 ---------
solr/licenses/jackson-datatype-jsr310-NOTICE.txt | 0
solr/licenses/jackson-jq-LICENSE-ASL.txt | 16 -
solr/licenses/jackson-jq-NOTICE.txt | 0
...jackson-module-jaxb-annotations-2.13.3.jar.sha1 | 1 +
.../licenses/jackson-module-kotlin-LICENSE-ASL.txt | 201 ---------
solr/licenses/jackson-module-kotlin-NOTICE.txt | 96 -----
.../jackson-module-parameter-names-LICENSE-ASL.txt | 201 ---------
.../jackson-module-parameter-names-NOTICE.txt | 0
solr/licenses/jakarta.inject-2.6.1.jar.sha1 | 1 +
solr/licenses/jakarta.inject-LICENSE-EPL.txt | 277 ++++++++++++
.../licenses/jakarta.validation-api-2.0.2.jar.sha1 | 1 +
....txt => jakarta.validation-api-LICENSE-ASL.txt} | 1 +
solr/licenses/jakarta.validation-api-NOTICE.txt | 9 +
solr/licenses/jakarta.ws.rs-api-2.1.6.jar.sha1 | 1 +
solr/licenses/jakarta.ws.rs-api-LICENSE-EPL.txt | 277 ++++++++++++
solr/licenses/javassist-3.25.0-GA.jar.sha1 | 1 +
solr/licenses/javassist-LICENSE-MPL.txt | 469 +++++++++++++++++++++
solr/licenses/jersey-LICENSE-EPL.txt | 277 ++++++++++++
solr/licenses/jersey-client-2.35.jar.sha1 | 1 +
solr/licenses/jersey-common-2.35.jar.sha1 | 1 +
.../jersey-container-grizzly2-http-2.35.jar.sha1 | 1 +
...jersey-container-grizzly2-servlet-2.35.jar.sha1 | 1 +
.../jersey-container-jetty-http-2.35.jar.sha1 | 1 +
.../jersey-container-servlet-2.35.jar.sha1 | 1 +
.../jersey-container-servlet-core-2.35.jar.sha1 | 1 +
.../licenses/jersey-entity-filtering-2.35.jar.sha1 | 1 +
solr/licenses/jersey-hk2-2.35.jar.sha1 | 1 +
solr/licenses/jersey-media-jaxb-2.35.jar.sha1 | 1 +
.../jersey-media-json-jackson-2.35.jar.sha1 | 1 +
solr/licenses/jersey-server-2.35.jar.sha1 | 1 +
.../jersey-test-framework-core-2.35.jar.sha1 | 1 +
...-test-framework-provider-grizzly2-2.35.jar.sha1 | 1 +
solr/licenses/osgi-resource-locator-1.0.3.jar.sha1 | 1 +
.../licenses/osgi-resource-locator-LICENSE-EPL.txt | 277 ++++++++++++
.../apache/solr/client/solrj/ResponseParser.java | 17 +
.../client/solrj/impl/BinaryResponseParser.java | 8 +
.../solr/client/solrj/impl/Http2SolrClient.java | 18 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 17 +-
.../java/org/apache/solr/common/SolrException.java | 20 +
.../java/org/apache/solr/common/util/Utils.java | 173 ++++++--
versions.lock | 52 ++-
versions.props | 3 +
118 files changed, 5668 insertions(+), 1966 deletions(-)
diff --git a/gradle/validation/forbidden-apis/com.fasterxml.jackson.core.jackson-annotations.solr.txt b/gradle/validation/forbidden-apis/com.fasterxml.jackson.core.jackson-annotations.solr.txt
deleted file mode 100644
index af88dea6791..00000000000
--- a/gradle/validation/forbidden-apis/com.fasterxml.jackson.core.jackson-annotations.solr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-@defaultMessage Use org.apache.solr.common.annotation.JsonProperty instead
-com.fasterxml.jackson.annotation.JsonProperty
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 072213fc35b..4f3ee758017 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -81,6 +81,18 @@ dependencies {
implementation 'javax.servlet:javax.servlet-api'
+ implementation "org.glassfish.jersey.containers:jersey-container-jetty-http"
+ permitUnusedDeclared "org.glassfish.jersey.containers:jersey-container-jetty-http"
+ implementation 'org.glassfish.jersey.inject:jersey-hk2'
+ permitUnusedDeclared 'org.glassfish.jersey.inject:jersey-hk2'
+ implementation 'org.glassfish.jersey.media:jersey-media-json-jackson'
+ permitUnusedDeclared 'org.glassfish.jersey.media:jersey-media-json-jackson'
+ implementation 'org.glassfish.jersey.core:jersey-common'
+ implementation 'org.glassfish.jersey.core:jersey-server'
+ implementation 'org.glassfish.hk2:hk2-api'
+ implementation 'org.glassfish.hk2.external:jakarta.inject'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api'
+
// Non-API below; although there are exceptions
runtimeOnly "org.apache.lucene:lucene-analysis-kuromoji"
@@ -183,6 +195,11 @@ dependencies {
testImplementation 'junit:junit'
testImplementation 'org.hamcrest:hamcrest'
+ testImplementation 'org.glassfish.jersey.test-framework:jersey-test-framework-core'
+ testImplementation 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2'
+ permitTestUnusedDeclared 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2'
+
+
testImplementation('org.mockito:mockito-core', {
exclude group: "net.bytebuddy", module: "byte-buddy-agent"
})
diff --git a/solr/core/src/java/org/apache/solr/api/ApiSupport.java b/solr/core/src/java/org/apache/solr/api/ApiSupport.java
index 7be5f683fc4..efeffcad773 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiSupport.java
+++ b/solr/core/src/java/org/apache/solr/api/ApiSupport.java
@@ -18,17 +18,27 @@
package org.apache.solr.api;
import java.util.Collection;
+import java.util.Collections;
/** The interface that is implemented by a request handler to support the V2 end point */
public interface ApiSupport {
/**
- * It is possible to support multiple v2 apis by a single requesthandler
+ * Returns any (non-JAX-RS annotated) APIs associated with this request handler.
*
- * @return the list of v2 api implementations
+ * @see #getJerseyResources()
*/
Collection<Api> getApis();
+ /**
+ * Returns any JAX-RS annotated v2 APIs associated with this request handler.
+ *
+ * @see #getApis()
+ */
+ default Collection<Class<? extends JerseyResource>> getJerseyResources() {
+ return Collections.emptySet();
+ }
+
/** Whether this should be made available at the regular legacy path */
default Boolean registerV1() {
return Boolean.TRUE;
diff --git a/solr/core/src/java/org/apache/solr/api/JerseyResource.java b/solr/core/src/java/org/apache/solr/api/JerseyResource.java
new file mode 100644
index 00000000000..9ee9cf2ef44
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/api/JerseyResource.java
@@ -0,0 +1,98 @@
+/*
+ * 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.api;
+
+import static org.apache.solr.jersey.RequestContextKeys.SOLR_JERSEY_RESPONSE;
+
+import java.util.function.Supplier;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.Context;
+import org.apache.solr.jersey.CatchAllExceptionMapper;
+import org.apache.solr.jersey.SolrJerseyResponse;
+import org.apache.solr.servlet.HttpSolrCall;
+
+/**
+ * A marker parent type for all Jersey "resource" classes.
+ *
+ * <p>"Resources" in Jersey are classes that define one or more API endpoints. As such they're
+ * analogous to the v1 {@link org.apache.solr.request.SolrRequestHandler} or the v2 {@link Api}.
+ */
+public class JerseyResource {
+
+ @Context public ContainerRequestContext containerRequestContext;
+
+ /**
+ * Create an instance of the {@link SolrJerseyResponse} subclass; registering it with the Jersey
+ * request-context upon creation.
+ *
+ * <p>This utility method primarily exists to allow Jersey resources to return error responses
+ * that match those returned by Solr's v1 APIs.
+ *
+ * <p>When a severe-enough exception halts a v1 request, Solr generates a summary of the error and
+ * attaches it to the {@link org.apache.solr.response.SolrQueryResponse} given to the request
+ * handler. This SolrQueryResponse may already hold some portion of the normal "success" response
+ * for that API.
+ *
+ * <p>The JAX-RS framework isn't well suited to mimicking responses of this sort, as the
+ * "response" from a Jersey resource is its return value (instead of a mutable method parameter
+ * that gets modified). This utility works around this limitation by attaching the eventual return
+ * value of a JerseyResource to the context associated with the Jersey request, as soon as its
+ * created. This allows partially-constructed responses to be accessed later in the case of an
+ * exception.
+ *
+ * <p>In order to instantiate arbitrary SolrJerseyResponse subclasses, this utility uses
+ * reflection to find and invoke the first (no-arg) constructor for the specified type.
+ * SolrJerseyResponse subclasses without a no-arg constructor can be instantiated and registered
+ * using {@link #instantiateJerseyResponse(Supplier)}
+ *
+ * @param clazz the SolrJerseyResponse class to instantiate and register
+ * @see CatchAllExceptionMapper
+ * @see HttpSolrCall#call()
+ */
+ @SuppressWarnings("unchecked")
+ protected <T extends SolrJerseyResponse> T instantiateJerseyResponse(Class<T> clazz) {
+ return instantiateJerseyResponse(
+ () -> {
+ try {
+ return (T) clazz.getConstructors()[0].newInstance();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ }
+
+ /**
+ * Create an instance of the {@link SolrJerseyResponse} subclass; registering it with the Jersey
+ * request-context upon creation.
+ *
+ * <p>This utility method primarily exists to allow Jersey resources to return responses,
+ * especially error responses, that match some of the particulars of Solr's traditional/v1 APIs.
+ * See the companion method {@link #instantiateJerseyResponse(Class)} for more details.
+ *
+ * @param instantiator a lambda to create the desired SolrJerseyResponse
+ * @see CatchAllExceptionMapper
+ * @see HttpSolrCall#call()
+ */
+ protected <T extends SolrJerseyResponse> T instantiateJerseyResponse(Supplier<T> instantiator) {
+ final T instance = instantiator.get();
+ if (containerRequestContext != null) {
+ containerRequestContext.setProperty(SOLR_JERSEY_RESPONSE, instance);
+ }
+ return instance;
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
index e622ac4e81a..d8366f4424a 100644
--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
@@ -25,6 +25,7 @@ import static org.apache.solr.servlet.SolrDispatchFilter.Action.REMOTEQUERY;
import com.google.common.collect.ImmutableSet;
import io.opentracing.Span;
import io.opentracing.tag.Tags;
+import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.HashMap;
@@ -53,13 +54,19 @@ import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.PluginBag;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.RequestHandlerUtils;
+import org.apache.solr.jersey.RequestContextKeys;
+import org.apache.solr.jersey.container.ContainerRequestUtils;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
+import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.security.AuthorizationContext;
import org.apache.solr.servlet.HttpSolrCall;
import org.apache.solr.servlet.SolrDispatchFilter;
import org.apache.solr.servlet.SolrRequestParsers;
+import org.apache.solr.servlet.cache.Method;
+import org.glassfish.jersey.server.ApplicationHandler;
+import org.glassfish.jersey.server.ContainerRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,6 +77,8 @@ public class V2HttpCall extends HttpSolrCall {
private Api api;
private List<String> pathSegments;
private String prefix;
+ private boolean servedByJaxRs =
+ false; // A flag indicating whether the request was served by JAX-RS or the native framework
HashMap<String, String> parts = new HashMap<>();
static final Set<String> knownPrefixes =
ImmutableSet.of("cluster", "node", "collections", "cores", "c");
@@ -90,6 +99,7 @@ public class V2HttpCall extends HttpSolrCall {
queryParams = SolrRequestParsers.parseQueryString(req.getQueryString());
String path = this.path;
final String fullPath = path = path.substring(7); // strip off '/____v2'
+
try {
pathSegments = PathTrie.getPathSegments(path);
if (pathSegments.size() == 0
@@ -126,8 +136,6 @@ public class V2HttpCall extends HttpSolrCall {
return;
}
assert core == null;
- throw new SolrException(
- SolrException.ErrorCode.NOT_FOUND, "Could not load plugin at " + path);
}
if ("c".equals(prefix) || "collections".equals(prefix)) {
@@ -159,20 +167,15 @@ public class V2HttpCall extends HttpSolrCall {
origCorename = pathSegments.get(1);
core = cores.getCore(origCorename);
}
+
+ // We didn't find a core, so we're either an error or a Jersey 'ADMIN' api
if (core == null) {
- log.error(">> path: '{}'", path);
- if (path.endsWith(CommonParams.INTROSPECT)) {
- initAdminRequest(path);
- return;
- } else {
- throw new SolrException(
- SolrException.ErrorCode.NOT_FOUND,
- "no core retrieved for core name: " + origCorename + ". Path: " + path);
- }
- } else {
- Thread.currentThread().setContextClassLoader(core.getResourceLoader().getClassLoader());
+ // initAdminRequest handles "custom plugin" Jersey APIs, as well as in-built ones
+ initAdminRequest(path);
+ return;
}
+ Thread.currentThread().setContextClassLoader(core.getResourceLoader().getClassLoader());
this.path = path = path.substring(prefix.length() + pathSegments.get(1).length() + 2);
Api apiInfo = getApiInfo(core.getRequestHandlers(), path, req.getMethod(), fullPath, parts);
if (isCompositeApi && apiInfo instanceof CompositeApi) {
@@ -181,7 +184,6 @@ public class V2HttpCall extends HttpSolrCall {
api = apiInfo == null ? api : apiInfo;
}
parseRequest();
-
addCollectionParamIfNeeded(getCollectionsList());
action = PROCESS;
@@ -275,7 +277,7 @@ public class V2HttpCall extends HttpSolrCall {
}
if (api == null) {
- return getSubPathApi(requestHandlers, path, fullPath, new CompositeApi(null));
+ return null;
}
if (api instanceof ApiBag.IntrospectApi) {
@@ -302,69 +304,11 @@ public class V2HttpCall extends HttpSolrCall {
RequestHandlerUtils.addExperimentalFormatWarning(rsp);
}
});
- getSubPathApi(requestHandlers, path, fullPath, (CompositeApi) api);
}
return api;
}
- private static CompositeApi getSubPathApi(
- PluginBag<SolrRequestHandler> requestHandlers,
- String path,
- String fullPath,
- CompositeApi compositeApi) {
-
- String newPath =
- path.endsWith(CommonParams.INTROSPECT)
- ? path.substring(0, path.length() - CommonParams.INTROSPECT.length())
- : path;
- Map<String, Set<String>> subpaths = new LinkedHashMap<>();
-
- getSubPaths(newPath, requestHandlers.getApiBag(), subpaths);
- final Map<String, Set<String>> subPaths = subpaths;
- if (subPaths.isEmpty()) return null;
- return compositeApi.add(
- new Api(() -> ValidatingJsonMap.EMPTY) {
- @Override
- public void call(SolrQueryRequest req1, SolrQueryResponse rsp) {
- String prefix = null;
- prefix =
- fullPath.endsWith(CommonParams.INTROSPECT)
- ? fullPath.substring(0, fullPath.length() - CommonParams.INTROSPECT.length())
- : fullPath;
- LinkedHashMap<String, Set<String>> result = new LinkedHashMap<>(subPaths.size());
- for (Map.Entry<String, Set<String>> e : subPaths.entrySet()) {
- if (e.getKey().endsWith(CommonParams.INTROSPECT)) continue;
- result.put(prefix + e.getKey(), e.getValue());
- }
-
- @SuppressWarnings({"unchecked"})
- Map<Object, Object> m = (Map<Object, Object>) rsp.getValues().get("availableSubPaths");
- if (m != null) {
- m.putAll(result);
- } else {
- rsp.add("availableSubPaths", result);
- }
- }
- });
- }
-
- private static void getSubPaths(String path, ApiBag bag, Map<String, Set<String>> pathsVsMethod) {
- for (SolrRequest.METHOD m : SolrRequest.METHOD.values()) {
- PathTrie<Api> registry = bag.getRegistry(m.toString());
- if (registry != null) {
- HashSet<String> subPaths = new HashSet<>();
- registry.lookup(path, new HashMap<>(), subPaths);
- for (String subPath : subPaths) {
- Set<String> supportedMethods = pathsVsMethod.get(subPath);
- if (supportedMethods == null)
- pathsVsMethod.put(subPath, supportedMethods = new HashSet<>());
- supportedMethods.add(m.toString());
- }
- }
- }
- }
-
public List<String> getPathSegments() {
return pathSegments;
}
@@ -390,33 +334,62 @@ public class V2HttpCall extends HttpSolrCall {
}
}
- @Override
- protected void handleAdmin(SolrQueryResponse solrResp) {
+ private void invokeJerseyRequest(
+ CoreContainer cores, SolrCore core, ApplicationHandler jerseyHandler, SolrQueryResponse rsp) {
try {
- api.call(this.solrReq, solrResp);
+ final ContainerRequest containerRequest =
+ ContainerRequestUtils.createContainerRequest(
+ req, response, jerseyHandler.getConfiguration());
+
+ // Set properties that may be used by Jersey filters downstream
+ containerRequest.setProperty(RequestContextKeys.SOLR_QUERY_REQUEST, solrReq);
+ containerRequest.setProperty(RequestContextKeys.SOLR_QUERY_RESPONSE, rsp);
+ containerRequest.setProperty(RequestContextKeys.CORE_CONTAINER, cores);
+ containerRequest.setProperty(RequestContextKeys.HTTP_SERVLET_REQ, req);
+ containerRequest.setProperty(RequestContextKeys.REQUEST_TYPE, requestType);
+ containerRequest.setProperty(RequestContextKeys.SOLR_PARAMS, queryParams);
+ containerRequest.setProperty(RequestContextKeys.COLLECTION_LIST, collectionsList);
+ containerRequest.setProperty(RequestContextKeys.HTTP_SERVLET_RSP, response);
+ if (core != null) {
+ containerRequest.setProperty(RequestContextKeys.SOLR_CORE, core);
+ }
+ servedByJaxRs = true;
+ jerseyHandler.handle(containerRequest);
} catch (Exception e) {
- solrResp.setException(e);
+ throw new RuntimeException(e);
}
}
@Override
- protected void execute(SolrQueryResponse rsp) {
- SolrCore.preDecorateResponse(solrReq, rsp);
+ protected void handleAdmin(SolrQueryResponse solrResp) {
if (api == null) {
- rsp.setException(
- new SolrException(
- SolrException.ErrorCode.NOT_FOUND,
- "Cannot find correspond api for the path : "
- + solrReq.getContext().get(CommonParams.PATH)));
+ invokeJerseyRequest(cores, null, cores.getJerseyApplicationHandler(), solrResp);
} else {
+ SolrCore.preDecorateResponse(solrReq, solrResp);
+ try {
+ api.call(this.solrReq, solrResp);
+ } catch (Exception e) {
+ solrResp.setException(e);
+ } finally {
+ SolrCore.postDecorateResponse(handler, solrReq, solrResp);
+ }
+ }
+ }
+
+ @Override
+ protected void executeCoreRequest(SolrQueryResponse rsp) {
+ if (api == null) {
+ invokeJerseyRequest(cores, core, core.getJerseyApplicationHandler(), rsp);
+ } else {
+ SolrCore.preDecorateResponse(solrReq, rsp);
try {
api.call(solrReq, rsp);
} catch (Exception e) {
rsp.setException(e);
+ } finally {
+ SolrCore.postDecorateResponse(handler, solrReq, rsp);
}
}
-
- SolrCore.postDecorateResponse(handler, solrReq, rsp);
}
@Override
@@ -487,6 +460,17 @@ public class V2HttpCall extends HttpSolrCall {
return builder.toString();
}
+ @Override
+ protected void writeResponse(
+ SolrQueryResponse solrRsp, QueryResponseWriter responseWriter, Method reqMethod)
+ throws IOException {
+ // JAX-RS has its own code that flushes out the Response to the relevant output stream, so we
+ // no-op here if the request was already handled via JAX-RS
+ if (!servedByJaxRs) {
+ super.writeResponse(solrRsp, responseWriter, reqMethod);
+ }
+ }
+
@Override
protected Object _getHandler() {
return api;
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 5e5bda2ae1f..fd1d7c1c682 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -60,6 +60,7 @@ import java.util.concurrent.TimeoutException;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
+import javax.inject.Singleton;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.auth.AuthSchemeProvider;
import org.apache.http.client.CredentialsProvider;
@@ -128,6 +129,7 @@ import org.apache.solr.handler.admin.ZookeeperStatusHandler;
import org.apache.solr.handler.api.ApiRegistrar;
import org.apache.solr.handler.component.ShardHandlerFactory;
import org.apache.solr.handler.designer.SchemaDesignerAPI;
+import org.apache.solr.jersey.CoreContainerFactory;
import org.apache.solr.logging.LogWatcher;
import org.apache.solr.logging.MDCLoggingContext;
import org.apache.solr.metrics.SolrCoreMetricManager;
@@ -153,6 +155,8 @@ import org.apache.solr.util.RefCounted;
import org.apache.solr.util.StartupLoggingUtils;
import org.apache.solr.util.stats.MetricUtils;
import org.apache.zookeeper.KeeperException;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import org.glassfish.jersey.server.ApplicationHandler;
import org.noggit.JSONParser;
import org.noggit.ObjectBuilder;
import org.slf4j.Logger;
@@ -187,6 +191,12 @@ public class CoreContainer {
private volatile PluginBag<SolrRequestHandler> containerHandlers =
new PluginBag<>(SolrRequestHandler.class, null);
+ private volatile ApplicationHandler jerseyAppHandler;
+
+ public ApplicationHandler getJerseyApplicationHandler() {
+ return jerseyAppHandler;
+ }
+
/** Minimize exposure to CoreContainer. Mostly only ZK interface is required */
public final Supplier<SolrZkClient> zkClientSupplier = () -> getZkController().getZkClient();
@@ -819,7 +829,6 @@ public class CoreContainer {
ClusterAPI clusterAPI = new ClusterAPI(collectionsHandler, configSetsHandler);
containerHandlers.getApiBag().registerObject(clusterAPI);
containerHandlers.getApiBag().registerObject(clusterAPI.commands);
- ApiRegistrar.registerConfigsetApis(containerHandlers.getApiBag(), this);
if (isZooKeeperAware()) {
containerHandlers.getApiBag().registerObject(new SchemaDesignerAPI(this));
@@ -1063,6 +1072,22 @@ public class CoreContainer {
zkSys.getZkController().checkOverseerDesignate();
}
}
+
+ final CoreContainer thisCCRef = this;
+ // Init the Jersey app once all CC endpoints have been registered
+ containerHandlers
+ .getJerseyEndpoints()
+ .register(
+ new AbstractBinder() {
+ @Override
+ protected void configure() {
+ bindFactory(new CoreContainerFactory(thisCCRef))
+ .to(CoreContainer.class)
+ .in(Singleton.class);
+ }
+ });
+ jerseyAppHandler = new ApplicationHandler(containerHandlers.getJerseyEndpoints());
+
// This is a bit redundant but these are two distinct concepts for all they're accomplished at
// the same time.
status |= LOAD_COMPLETE | INITIAL_CORE_LOAD_COMPLETE;
diff --git a/solr/core/src/java/org/apache/solr/core/PluginBag.java b/solr/core/src/java/org/apache/solr/core/PluginBag.java
index a6cc58628b4..bdf8bfeb307 100644
--- a/solr/core/src/java/org/apache/solr/core/PluginBag.java
+++ b/solr/core/src/java/org/apache/solr/core/PluginBag.java
@@ -32,20 +32,24 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;
import java.util.stream.Collectors;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.solr.api.Api;
import org.apache.solr.api.ApiBag;
import org.apache.solr.api.ApiSupport;
+import org.apache.solr.api.JerseyResource;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.handler.component.SearchComponent;
+import org.apache.solr.jersey.JerseyApplications;
import org.apache.solr.pkg.PackagePluginHolder;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
import org.apache.solr.util.plugin.PluginInfoInitialized;
import org.apache.solr.util.plugin.SolrCoreAware;
+import org.glassfish.jersey.server.ResourceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,10 +64,27 @@ public class PluginBag<T> implements AutoCloseable {
private SolrCore core;
private final SolrConfig.SolrPluginInfo meta;
private final ApiBag apiBag;
+ private final ResourceConfig jerseyResources;
+
+ public static class JerseyMetricsLookupRegistry
+ extends HashMap<Class<? extends JerseyResource>, RequestHandlerBase> {}
+
+ private final JerseyMetricsLookupRegistry infoBeanByResource;
/** Pass needThreadSafety=true if plugins can be added and removed concurrently with lookups. */
public PluginBag(Class<T> klass, SolrCore core, boolean needThreadSafety) {
- this.apiBag = klass == SolrRequestHandler.class ? new ApiBag(core != null) : null;
+ if (klass == SolrRequestHandler.class) {
+ this.apiBag = new ApiBag(core != null);
+ this.infoBeanByResource = new JerseyMetricsLookupRegistry();
+ this.jerseyResources =
+ (core == null)
+ ? new JerseyApplications.CoreContainerApp(infoBeanByResource)
+ : new JerseyApplications.SolrCoreApp(core, infoBeanByResource);
+ } else {
+ this.apiBag = null;
+ this.jerseyResources = null;
+ this.infoBeanByResource = null;
+ }
this.core = core;
this.klass = klass;
// TODO: since reads will dominate writes, we could also think about creating a new instance of
@@ -213,6 +234,24 @@ public class PluginBag<T> implements AutoCloseable {
apiBag.register(api, nameSubstitutes);
}
}
+
+ // TODO Should we use <requestHandler name="/blah"> to override the path that each
+ // resource registers under?
+ Collection<Class<? extends JerseyResource>> jerseyApis =
+ apiSupport.getJerseyResources();
+ if (!CollectionUtils.isEmpty(jerseyApis)) {
+ for (Class<? extends JerseyResource> jerseyClazz : jerseyApis) {
+ if (log.isDebugEnabled()) {
+ log.debug("Registering jersey resource class: {}", jerseyClazz.getName());
+ }
+ jerseyResources.register(jerseyClazz);
+ // See MetricsBeanFactory javadocs for a better understanding of this resource->RH
+ // mapping
+ if (inst instanceof RequestHandlerBase) {
+ infoBeanByResource.put(jerseyClazz, (RequestHandlerBase) inst);
+ }
+ }
+ }
}
}
} else {
@@ -490,4 +529,8 @@ public class PluginBag<T> implements AutoCloseable {
public ApiBag getApiBag() {
return apiBag;
}
+
+ public ResourceConfig getJerseyEndpoints() {
+ return jerseyResources;
+ }
}
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 16758060210..8423b192b7f 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -176,6 +176,7 @@ import org.apache.solr.util.plugin.SolrCoreAware;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
import org.eclipse.jetty.io.RuntimeIOException;
+import org.glassfish.jersey.server.ApplicationHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -184,7 +185,7 @@ import org.slf4j.LoggerFactory;
* to make it work. When multi-core support was added to Solr way back in version 1.3, this class
* was required so that the core functionality could be re-used multiple times.
*/
-public final class SolrCore implements SolrInfoBean, Closeable {
+public class SolrCore implements SolrInfoBean, Closeable {
public static final String version = "1.0";
@@ -222,6 +223,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
private final Date startTime = new Date();
private final long startNanoTime = System.nanoTime();
private final RequestHandlers reqHandlers;
+ private final ApplicationHandler jerseyAppHandler;
private final PluginBag<SearchComponent> searchComponents =
new PluginBag<>(SearchComponent.class, this);
private final PluginBag<UpdateRequestProcessorFactory> updateProcessors =
@@ -1132,6 +1134,8 @@ public final class SolrCore implements SolrInfoBean, Closeable {
updateProcessorChains = loadUpdateProcessorChains();
reqHandlers = new RequestHandlers(this);
reqHandlers.initHandlersFromConfig(solrConfig);
+ jerseyAppHandler =
+ new ApplicationHandler(reqHandlers.getRequestHandlers().getJerseyEndpoints());
// cause the executor to stall so firstSearcher events won't fire
// until after inform() has been called for all components.
@@ -1954,6 +1958,10 @@ public final class SolrCore implements SolrInfoBean, Closeable {
return reqHandlers.handlers;
}
+ public ApplicationHandler getJerseyApplicationHandler() {
+ return jerseyAppHandler;
+ }
+
/**
* Registers a handler at the specified location. If one exists there, it will be replaced. To
* remove a handler, register <code>null</code> at its path
diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
index d7268212ea2..b0c5da5b895 100644
--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
@@ -174,13 +174,13 @@ public abstract class RequestHandlerBase
"NO_OP",
"NO_OP"));
- private final Meter numErrors;
- private final Meter numServerErrors;
- private final Meter numClientErrors;
- private final Meter numTimeouts;
- private final Counter requests;
- private final Timer requestTimes;
- private final Counter totalTime;
+ public final Meter numErrors;
+ public final Meter numServerErrors;
+ public final Meter numClientErrors;
+ public final Meter numTimeouts;
+ public final Counter requests;
+ public final Timer requestTimes;
+ public final Counter totalTime;
public HandlerMetrics(SolrMetricsContext solrMetricsContext, String... metricPath) {
numErrors = solrMetricsContext.meter("errors", metricPath);
@@ -232,54 +232,52 @@ public abstract class RequestHandlerBase
}
}
} catch (Exception e) {
- if (req.getCore() != null) {
- boolean isTragic = req.getCoreContainer().checkTragicException(req.getCore());
- if (isTragic) {
- if (e instanceof SolrException) {
- // Tragic exceptions should always throw a server error
- assert ((SolrException) e).code() == 500;
- } else {
- // wrap it in a solr exception
- e = new SolrException(SolrException.ErrorCode.SERVER_ERROR, e.getMessage(), e);
- }
- }
- }
- boolean incrementErrors = true;
- boolean isServerError = true;
- if (e instanceof SolrException) {
- SolrException se = (SolrException) e;
- if (se.code() == SolrException.ErrorCode.CONFLICT.code) {
- incrementErrors = false;
- } else if (se.code() >= 400 && se.code() < 500) {
- isServerError = false;
- }
- } else {
- if (e instanceof SyntaxError) {
- isServerError = false;
- e = new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
- }
- }
-
+ e = normalizeReceivedException(req, e);
+ processErrorMetricsOnException(e, metrics);
rsp.setException(e);
-
- if (incrementErrors) {
- SolrException.log(log, e);
-
- metrics.numErrors.mark();
- if (isServerError) {
- metrics.numServerErrors.mark();
- } else {
- metrics.numClientErrors.mark();
- }
- }
} finally {
long elapsed = timer.stop();
metrics.totalTime.inc(elapsed);
}
}
+ public static void processErrorMetricsOnException(Exception e, HandlerMetrics metrics) {
+ boolean isClientError = false;
+ if (e instanceof SolrException) {
+ final SolrException se = (SolrException) e;
+ if (se.code() == SolrException.ErrorCode.CONFLICT.code) {
+ return;
+ } else if (se.code() >= 400 && se.code() < 500) {
+ isClientError = true;
+ }
+ }
+
+ SolrException.log(log, e);
+ metrics.numErrors.mark();
+ if (isClientError) {
+ metrics.numClientErrors.mark();
+ } else {
+ metrics.numServerErrors.mark();
+ }
+ }
+
+ public static Exception normalizeReceivedException(SolrQueryRequest req, Exception e) {
+ if (req.getCore() != null) {
+ assert req.getCoreContainer() != null;
+ if (req.getCoreContainer().checkTragicException(req.getCore())) {
+ return SolrException.wrapLuceneTragicExceptionIfNecessary(e);
+ }
+ }
+
+ if (e instanceof SyntaxError) {
+ return new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
+ }
+
+ return e;
+ }
+
/** The metrics to be used for this request. */
- protected HandlerMetrics getMetricsForThisRequest(SolrQueryRequest req) {
+ public HandlerMetrics getMetricsForThisRequest(SolrQueryRequest req) {
return this.metrics;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
index 13f779fe1fa..da216ed6510 100644
--- a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
@@ -35,6 +35,7 @@ import java.util.Set;
import org.apache.solr.api.AnnotatedApi;
import org.apache.solr.api.Api;
import org.apache.solr.api.ApiBag;
+import org.apache.solr.api.JerseyResource;
import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.MapWriter;
import org.apache.solr.common.SolrException;
@@ -60,6 +61,7 @@ import org.apache.solr.handler.admin.api.SchemaSimilarityAPI;
import org.apache.solr.handler.admin.api.SchemaUniqueKeyAPI;
import org.apache.solr.handler.admin.api.SchemaVersionAPI;
import org.apache.solr.handler.admin.api.SchemaZkVersionAPI;
+import org.apache.solr.handler.api.V2ApiUtils;
import org.apache.solr.pkg.PackageListeningClassLoader;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
@@ -153,12 +155,8 @@ public class SchemaHandler extends RequestHandlerBase
break;
case "/schema/name":
{
- final String schemaName = req.getSchema().getSchemaName();
- if (null == schemaName) {
- String message = "Schema has no name";
- throw new SolrException(SolrException.ErrorCode.NOT_FOUND, message);
- }
- rsp.add(IndexSchema.NAME, schemaName);
+ V2ApiUtils.squashIntoSolrResponseWithoutHeader(
+ rsp, new SchemaNameAPI(req.getCore()).getSchemaName());
break;
}
case "/schema/zkversion":
@@ -315,7 +313,6 @@ public class SchemaHandler extends RequestHandlerBase
public Collection<Api> getApis() {
final List<Api> apis = new ArrayList<>();
- apis.addAll(AnnotatedApi.getApis(new SchemaNameAPI(this)));
apis.addAll(AnnotatedApi.getApis(new SchemaInfoAPI(this)));
apis.addAll(AnnotatedApi.getApis(new SchemaUniqueKeyAPI(this)));
apis.addAll(AnnotatedApi.getApis(new SchemaVersionAPI(this)));
@@ -333,6 +330,11 @@ public class SchemaHandler extends RequestHandlerBase
return apis;
}
+ @Override
+ public Collection<Class<? extends JerseyResource>> getJerseyResources() {
+ return List.of(SchemaNameAPI.class);
+ }
+
@Override
public Boolean registerV2() {
return Boolean.TRUE;
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
index 737f15a5fc6..60ac03f9797 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
@@ -21,8 +21,14 @@ import static org.apache.solr.handler.configsets.UploadConfigSetFileAPI.FILEPATH
import com.google.common.collect.Maps;
import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import org.apache.solr.api.AnnotatedApi;
+import org.apache.solr.api.Api;
+import org.apache.solr.api.JerseyResource;
import org.apache.solr.api.PayloadObj;
import org.apache.solr.client.solrj.request.beans.CreateConfigPayload;
import org.apache.solr.cloud.ConfigSetCmds;
@@ -35,6 +41,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.handler.RequestHandlerBase;
+import org.apache.solr.handler.api.V2ApiUtils;
import org.apache.solr.handler.configsets.CreateConfigSetAPI;
import org.apache.solr.handler.configsets.DeleteConfigSetAPI;
import org.apache.solr.handler.configsets.ListConfigSetsAPI;
@@ -136,7 +143,8 @@ public class ConfigSetsHandler extends RequestHandlerBase implements PermissionN
}
break;
case LIST:
- new ListConfigSetsAPI(coreContainer).listConfigSet(req, rsp);
+ final ListConfigSetsAPI listConfigSetsAPI = new ListConfigSetsAPI(coreContainer);
+ V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, listConfigSetsAPI.listConfigSet());
break;
case CREATE:
final String newConfigSetName = req.getParams().get(NAME);
@@ -192,6 +200,26 @@ public class ConfigSetsHandler extends RequestHandlerBase implements PermissionN
return Category.ADMIN;
}
+ public Boolean registerV2() {
+ return true;
+ }
+
+ @Override
+ public Collection<Api> getApis() {
+ final List<Api> apis = new ArrayList<>();
+ apis.addAll(AnnotatedApi.getApis(new CreateConfigSetAPI(coreContainer)));
+ apis.addAll(AnnotatedApi.getApis(new DeleteConfigSetAPI(coreContainer)));
+ apis.addAll(AnnotatedApi.getApis(new UploadConfigSetAPI(coreContainer)));
+ apis.addAll(AnnotatedApi.getApis(new UploadConfigSetFileAPI(coreContainer)));
+
+ return apis;
+ }
+
+ @Override
+ public Collection<Class<? extends JerseyResource>> getJerseyResources() {
+ return List.of(ListConfigSetsAPI.class);
+ }
+
@Override
public Name getPermissionName(AuthorizationContext ctx) {
String a = ctx.getParams().get(ConfigSetParams.ACTION);
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/SchemaNameAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/SchemaNameAPI.java
index 6fb536a56bb..021d362fa3f 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/SchemaNameAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/SchemaNameAPI.java
@@ -17,12 +17,19 @@
package org.apache.solr.handler.admin.api;
-import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET;
+import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
-import org.apache.solr.api.EndPoint;
-import org.apache.solr.handler.SchemaHandler;
-import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.response.SolrQueryResponse;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import org.apache.solr.api.JerseyResource;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.jersey.PermissionName;
+import org.apache.solr.jersey.SolrJerseyResponse;
+import org.apache.solr.schema.IndexSchema;
import org.apache.solr.security.PermissionNameProvider;
/**
@@ -31,18 +38,33 @@ import org.apache.solr.security.PermissionNameProvider;
* <p>This API (GET /v2/collections/collectionName/schema/name) is analogous to the v1
* /solr/collectionName/schema/name API.
*/
-public class SchemaNameAPI {
- private final SchemaHandler schemaHandler;
+@Path("/collections/{collectionName}/schema/name")
+public class SchemaNameAPI extends JerseyResource {
- public SchemaNameAPI(SchemaHandler schemaHandler) {
- this.schemaHandler = schemaHandler;
+ private SolrCore solrCore;
+
+ @Inject
+ public SchemaNameAPI(SolrCore solrCore) {
+ this.solrCore = solrCore;
+ }
+
+ @GET
+ @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2})
+ @PermissionName(PermissionNameProvider.Name.SCHEMA_READ_PERM)
+ public GetSchemaNameResponse getSchemaName() throws Exception {
+ final GetSchemaNameResponse response = instantiateJerseyResponse(GetSchemaNameResponse.class);
+ final IndexSchema schema = solrCore.getLatestSchema();
+ if (null == schema.getSchemaName()) {
+ throw new SolrException(SolrException.ErrorCode.NOT_FOUND, "Schema has no name");
+ }
+
+ response.name = schema.getSchemaName();
+ return response;
}
- @EndPoint(
- path = {"/schema/name"},
- method = GET,
- permission = PermissionNameProvider.Name.SCHEMA_READ_PERM)
- public void getSchemaName(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
- schemaHandler.handleRequestBody(req, rsp);
+ /** Response for {@link SchemaNameAPI}. */
+ public static class GetSchemaNameResponse extends SolrJerseyResponse {
+ @JsonProperty("name")
+ public String name;
}
}
diff --git a/solr/core/src/java/org/apache/solr/handler/api/ApiRegistrar.java b/solr/core/src/java/org/apache/solr/handler/api/ApiRegistrar.java
index 0fdbe40122d..a0de011d3ca 100644
--- a/solr/core/src/java/org/apache/solr/handler/api/ApiRegistrar.java
+++ b/solr/core/src/java/org/apache/solr/handler/api/ApiRegistrar.java
@@ -18,7 +18,6 @@
package org.apache.solr.handler.api;
import org.apache.solr.api.ApiBag;
-import org.apache.solr.core.CoreContainer;
import org.apache.solr.handler.admin.CollectionsHandler;
import org.apache.solr.handler.admin.api.AddReplicaAPI;
import org.apache.solr.handler.admin.api.AddReplicaPropertyAPI;
@@ -38,11 +37,6 @@ import org.apache.solr.handler.admin.api.ReloadCollectionAPI;
import org.apache.solr.handler.admin.api.SetCollectionPropertyAPI;
import org.apache.solr.handler.admin.api.SplitShardAPI;
import org.apache.solr.handler.admin.api.SyncShardAPI;
-import org.apache.solr.handler.configsets.CreateConfigSetAPI;
-import org.apache.solr.handler.configsets.DeleteConfigSetAPI;
-import org.apache.solr.handler.configsets.ListConfigSetsAPI;
-import org.apache.solr.handler.configsets.UploadConfigSetAPI;
-import org.apache.solr.handler.configsets.UploadConfigSetFileAPI;
/**
* Registers annotation-based V2 APIs with an {@link ApiBag}
@@ -79,12 +73,4 @@ public class ApiRegistrar {
// here for simplicity.
apiBag.registerObject(new DeleteReplicaAPI(collectionsHandler));
}
-
- public static void registerConfigsetApis(ApiBag apiBag, CoreContainer container) {
- apiBag.registerObject(new CreateConfigSetAPI(container));
- apiBag.registerObject(new DeleteConfigSetAPI(container));
- apiBag.registerObject(new ListConfigSetsAPI(container));
- apiBag.registerObject(new UploadConfigSetAPI(container));
- apiBag.registerObject(new UploadConfigSetFileAPI(container));
- }
}
diff --git a/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java b/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java
index d0a4ad54892..132671a5c5d 100644
--- a/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java
+++ b/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java
@@ -17,8 +17,13 @@
package org.apache.solr.handler.api;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
+import org.apache.solr.common.MapWriter.EntryWriter;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.jersey.JacksonReflectMapWriter;
+import org.apache.solr.response.SolrQueryResponse;
/** Utilities helpful for common V2 API declaration tasks. */
public class V2ApiUtils {
@@ -40,4 +45,55 @@ public class V2ApiUtils {
final String flattenedStr = String.join(",", toFlatten);
destination.put(newKey, flattenedStr);
}
+
+ /**
+ * Convert a JacksonReflectMapWriter (typically a {@link
+ * org.apache.solr.jersey.SolrJerseyResponse}) into the NamedList on a SolrQueryResponse, omitting
+ * the response header
+ *
+ * @param rsp the response to attach the resulting NamedList to
+ * @param mw the input object to be converted into a NamedList
+ */
+ public static void squashIntoSolrResponseWithoutHeader(
+ SolrQueryResponse rsp, JacksonReflectMapWriter mw) {
+ squashIntoNamedList(rsp.getValues(), mw, true);
+ }
+
+ /**
+ * Convert a JacksonReflectMapWriter (typically a {@link
+ * org.apache.solr.jersey.SolrJerseyResponse}) into the NamedList on a SolrQueryResponse,
+ * including the response header
+ *
+ * @param rsp the response to attach the resulting NamedList to
+ * @param mw the input object to be converted into a NamedList
+ */
+ public static void squashIntoSolrResponseWithHeader(
+ SolrQueryResponse rsp, JacksonReflectMapWriter mw) {
+ squashIntoNamedList(rsp.getValues(), mw, false);
+ }
+
+ public static void squashIntoNamedList(
+ NamedList<Object> destination, JacksonReflectMapWriter mw) {
+ squashIntoNamedList(destination, mw, false);
+ }
+
+ private static void squashIntoNamedList(
+ NamedList<Object> destination, JacksonReflectMapWriter mw, boolean trimHeader) {
+ try {
+ mw.writeMap(
+ new EntryWriter() {
+ @Override
+ public EntryWriter put(CharSequence key, Object value) {
+ var kStr = key.toString();
+ if (trimHeader && kStr.equals("responseHeader")) {
+ return null;
+ }
+ destination.add(kStr, value);
+ return this; // returning "this" means we can't use a lambda :-(
+ }
+ });
+ } catch (IOException e) {
+ throw new RuntimeException(e); // impossible
+ }
+ }
}
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index 13afb2fcdca..9bec8533335 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -138,7 +138,7 @@ public class SearchHandler extends RequestHandlerBase
}
@Override
- protected HandlerMetrics getMetricsForThisRequest(SolrQueryRequest req) {
+ public HandlerMetrics getMetricsForThisRequest(SolrQueryRequest req) {
return req.getParams().getBool(ShardParams.IS_SHARD, false) ? this.metricsShard : this.metrics;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSetsAPI.java b/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSetsAPI.java
index ae872de68af..163bbbc639c 100644
--- a/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSetsAPI.java
+++ b/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSetsAPI.java
@@ -16,34 +16,51 @@
*/
package org.apache.solr.handler.configsets;
-import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET;
import static org.apache.solr.security.PermissionNameProvider.Name.CONFIG_READ_PERM;
+import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
-import org.apache.solr.api.EndPoint;
-import org.apache.solr.client.solrj.SolrResponse;
-import org.apache.solr.cloud.OverseerSolrResponse;
-import org.apache.solr.common.util.NamedList;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import org.apache.solr.api.JerseyResource;
import org.apache.solr.core.CoreContainer;
-import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.jersey.PermissionName;
+import org.apache.solr.jersey.SolrJerseyResponse;
/**
* V2 API for adding or updating a single file within a configset.
*
* <p>This API (GET /v2/cluster/configs) is analogous to the v1 /admin/configs?action=LIST command.
*/
-public class ListConfigSetsAPI extends ConfigSetAPIBase {
+@Path("/cluster/configs")
+public class ListConfigSetsAPI extends JerseyResource {
+
+ @Context public HttpHeaders headers;
+
+ private final CoreContainer coreContainer;
+
+ @Inject
public ListConfigSetsAPI(CoreContainer coreContainer) {
- super(coreContainer);
+ this.coreContainer = coreContainer;
}
- @EndPoint(method = GET, path = "/cluster/configs", permission = CONFIG_READ_PERM)
- public void listConfigSet(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
- final NamedList<Object> results = new NamedList<>();
- List<String> configSetsList = configSetService.listConfigs();
- results.add("configSets", configSetsList);
- SolrResponse response = new OverseerSolrResponse(results);
- rsp.getValues().addAll(response.getResponse());
+ @GET
+ @Produces({"application/json", "application/javabin"})
+ @PermissionName(CONFIG_READ_PERM)
+ public ListConfigsetsResponse listConfigSet() throws Exception {
+ final ListConfigsetsResponse response = instantiateJerseyResponse(ListConfigsetsResponse.class);
+ response.configSets = coreContainer.getConfigSetService().listConfigs();
+ return response;
+ }
+
+ /** Response body POJO for the {@link ListConfigSetsAPI} resource. */
+ public static class ListConfigsetsResponse extends SolrJerseyResponse {
+
+ @JsonProperty("configSets")
+ public List<String> configSets;
}
}
diff --git a/solr/core/src/java/org/apache/solr/jersey/CatchAllExceptionMapper.java b/solr/core/src/java/org/apache/solr/jersey/CatchAllExceptionMapper.java
new file mode 100644
index 00000000000..6d08f7fe86a
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/CatchAllExceptionMapper.java
@@ -0,0 +1,131 @@
+/*
+ * 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.jersey;
+
+import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
+import static org.apache.solr.common.SolrException.ErrorCode.getErrorCode;
+import static org.apache.solr.common.params.CommonParams.WT;
+import static org.apache.solr.jersey.RequestContextKeys.HANDLER_METRICS;
+import static org.apache.solr.jersey.RequestContextKeys.SOLR_JERSEY_RESPONSE;
+import static org.apache.solr.jersey.RequestContextKeys.SOLR_QUERY_REQUEST;
+import static org.apache.solr.jersey.RequestContextKeys.SOLR_QUERY_RESPONSE;
+
+import java.lang.invoke.MethodHandles;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.params.CommonParams;
+import org.apache.solr.handler.RequestHandlerBase;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.servlet.ResponseUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+// TODO Create separate ExceptionMapper for WebApplicationException
+/**
+ * Flattens the exception and sets on a {@link SolrJerseyResponse}.
+ *
+ * <p>Format and behavior based on the exception handling in Solr's v1 requestHandler's. Also sets
+ * metrics if present on the request context.
+ */
+public class CatchAllExceptionMapper implements ExceptionMapper<Exception> {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @Context public ResourceContext resourceContext;
+
+ @Override
+ public Response toResponse(Exception exception) {
+ final ContainerRequestContext containerRequestContext =
+ resourceContext.getResource(ContainerRequestContext.class);
+
+ // Set the exception on the SolrQueryResponse. Not to affect the actual response, but as
+ // SolrDispatchFiler and HttpSolrCall use the presence of an exception as a marker of
+ // success/failure for AuditLogging, and other logic.
+ final SolrQueryResponse solrQueryResponse =
+ (SolrQueryResponse) containerRequestContext.getProperty(SOLR_QUERY_RESPONSE);
+ final SolrQueryRequest solrQueryRequest =
+ (SolrQueryRequest) containerRequestContext.getProperty(SOLR_QUERY_REQUEST);
+ if (exception instanceof NotFoundException) {
+ // For backwards compatibility with existing v2 API format
+ exception =
+ new SolrException(
+ SolrException.ErrorCode.NOT_FOUND,
+ "Cannot find API for the path: "
+ + solrQueryRequest.getContext().get(CommonParams.PATH));
+ solrQueryResponse.setException(exception);
+ } else if (exception instanceof WebApplicationException) {
+ final WebApplicationException wae = (WebApplicationException) exception;
+ final SolrException solrException =
+ new SolrException(getErrorCode(wae.getResponse().getStatus()), wae.getMessage());
+ solrQueryResponse.setException(solrException);
+ } else {
+ solrQueryResponse.setException(exception);
+ }
+
+ // Exceptions coming from the JAX-RS framework itself should be handled separately.
+ if (exception instanceof WebApplicationException) {
+ return processWebApplicationException((WebApplicationException) exception);
+ }
+
+ // First, handle any exception-related metrics
+ final Exception normalizedException =
+ RequestHandlerBase.normalizeReceivedException(solrQueryRequest, exception);
+ final RequestHandlerBase.HandlerMetrics metrics =
+ (RequestHandlerBase.HandlerMetrics) containerRequestContext.getProperty(HANDLER_METRICS);
+ if (metrics != null) {
+ RequestHandlerBase.processErrorMetricsOnException(normalizedException, metrics);
+ }
+
+ // Then, convert the exception into a SolrJerseyResponse (creating one as necessary
+ // if response not found, etc.)
+ final SolrJerseyResponse response =
+ containerRequestContext.getProperty(SOLR_JERSEY_RESPONSE) == null
+ ? new SolrJerseyResponse()
+ : (SolrJerseyResponse) containerRequestContext.getProperty(SOLR_JERSEY_RESPONSE);
+
+ response.error = ResponseUtils.getTypedErrorInfo(normalizedException, log);
+ response.responseHeader.status = response.error.code;
+ final String mediaType = getMediaType(solrQueryRequest);
+ return Response.status(response.error.code).type(mediaType).entity(response).build();
+ }
+
+ private String getMediaType(SolrQueryRequest solrQueryRequest) {
+ final String wtParam = solrQueryRequest.getParams().get(WT);
+ if (wtParam == null) return "application/json";
+
+ // The only currently-supported response-formats for JAX-RS v2 endpoints.
+ switch (wtParam) {
+ case "xml":
+ return "application/xml";
+ case "javabin":
+ return BINARY_CONTENT_TYPE_V2;
+ default:
+ return "application/json";
+ }
+ }
+
+ private Response processWebApplicationException(WebApplicationException wae) {
+ return wae.getResponse();
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/api/ApiSupport.java b/solr/core/src/java/org/apache/solr/jersey/CoreContainerFactory.java
similarity index 53%
copy from solr/core/src/java/org/apache/solr/api/ApiSupport.java
copy to solr/core/src/java/org/apache/solr/jersey/CoreContainerFactory.java
index 7be5f683fc4..8b3f02ad326 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiSupport.java
+++ b/solr/core/src/java/org/apache/solr/jersey/CoreContainerFactory.java
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -15,27 +15,30 @@
* limitations under the License.
*/
-package org.apache.solr.api;
+package org.apache.solr.jersey;
-import java.util.Collection;
+import org.apache.solr.core.CoreContainer;
+import org.glassfish.hk2.api.Factory;
-/** The interface that is implemented by a request handler to support the V2 end point */
-public interface ApiSupport {
+/**
+ * Allows the CoreContainer used by this Solr process to be injected into individual resource
+ * classes at call-time.
+ */
+public class CoreContainerFactory implements Factory<CoreContainer> {
+
+ private final CoreContainer singletonCC;
- /**
- * It is possible to support multiple v2 apis by a single requesthandler
- *
- * @return the list of v2 api implementations
- */
- Collection<Api> getApis();
+ public CoreContainerFactory(CoreContainer singletonCC) {
+ this.singletonCC = singletonCC;
+ }
- /** Whether this should be made available at the regular legacy path */
- default Boolean registerV1() {
- return Boolean.TRUE;
+ @Override
+ public CoreContainer provide() {
+ return singletonCC;
}
- /** Whether this request handler must be made available at the /v2/ path */
- default Boolean registerV2() {
- return Boolean.FALSE;
+ @Override
+ public void dispose(CoreContainer instance) {
+ /* No-op */
}
}
diff --git a/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java b/solr/core/src/java/org/apache/solr/jersey/ErrorInfo.java
similarity index 50%
copy from solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java
copy to solr/core/src/java/org/apache/solr/jersey/ErrorInfo.java
index d0a4ad54892..24ca06d64ff 100644
--- a/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java
+++ b/solr/core/src/java/org/apache/solr/jersey/ErrorInfo.java
@@ -15,29 +15,39 @@
* limitations under the License.
*/
-package org.apache.solr.handler.api;
+package org.apache.solr.jersey;
+import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
import java.util.Map;
+import org.apache.solr.common.SolrException;
-/** Utilities helpful for common V2 API declaration tasks. */
-public class V2ApiUtils {
- private V2ApiUtils() {
- /* Private ctor prevents instantiation */
- }
+/**
+ * A value type representing an error.
+ *
+ * <p>Based on the fields exposed in responses from Solr's v1/requestHandler API.
+ */
+public class ErrorInfo implements JacksonReflectMapWriter {
+ @JsonProperty("metadata")
+ public ErrorMetadata metadata;
- public static void flattenMapWithPrefix(
- Map<String, Object> toFlatten, Map<String, Object> destination, String additionalPrefix) {
- if (toFlatten == null || toFlatten.isEmpty() || destination == null) {
- return;
- }
+ @JsonProperty("details")
+ public List<Map<String, Object>> details;
- toFlatten.forEach((k, v) -> destination.put(additionalPrefix + k, v));
- }
+ @JsonProperty("msg")
+ public String msg;
+
+ @JsonProperty("trace")
+ public String trace;
+
+ @JsonProperty("code")
+ public Integer code;
+
+ public static class ErrorMetadata implements JacksonReflectMapWriter {
+ @JsonProperty(SolrException.ERROR_CLASS)
+ public String errorClass;
- public static void flattenToCommaDelimitedString(
- Map<String, Object> destination, List<String> toFlatten, String newKey) {
- final String flattenedStr = String.join(",", toFlatten);
- destination.put(newKey, flattenedStr);
+ @JsonProperty(SolrException.ROOT_ERROR_CLASS)
+ public String rootErrorClass;
}
}
diff --git a/solr/core/src/java/org/apache/solr/jersey/JacksonReflectMapWriter.java b/solr/core/src/java/org/apache/solr/jersey/JacksonReflectMapWriter.java
new file mode 100644
index 00000000000..a7dbe46338d
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/JacksonReflectMapWriter.java
@@ -0,0 +1,50 @@
+/*
+ * 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.jersey;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.IOException;
+import org.apache.solr.common.MapWriter;
+import org.apache.solr.common.util.Utils;
+
+/**
+ * A {@link MapWriter} implementation that relies on Jackson's {@link JsonProperty} annotation.
+ *
+ * <p>Similar to {@link org.apache.solr.common.util.ReflectMapWriter}, except for its use of the
+ * Jackson annotation instead of our own homegrown alternative, {@link
+ * org.apache.solr.common.annotation.JsonProperty}. This is useful for when the objects involved
+ * must interact with 3rd party libraries that expect Jackson, such as Jersey/
+ *
+ * @see org.apache.solr.common.util.ReflectMapWriter
+ */
+public interface JacksonReflectMapWriter extends MapWriter {
+ @Override
+ default void writeMap(EntryWriter ew) throws IOException {
+ Utils.reflectWrite(
+ ew,
+ this,
+ // TODO Should we be lenient here and accept both the Jackson and our homegrown annotation?
+ field -> field.getAnnotation(JsonProperty.class) != null,
+ JsonAnyGetter.class,
+ field -> {
+ final JsonProperty prop = field.getAnnotation(JsonProperty.class);
+ return prop.value().isEmpty() ? field.getName() : prop.value();
+ });
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/jersey/JerseyApplications.java b/solr/core/src/java/org/apache/solr/jersey/JerseyApplications.java
new file mode 100644
index 00000000000..c72dbd05318
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/JerseyApplications.java
@@ -0,0 +1,86 @@
+/*
+ * 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.jersey;
+
+import javax.inject.Singleton;
+import org.apache.solr.core.PluginBag;
+import org.apache.solr.core.SolrCore;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
+
+/**
+ * JAX-RS "application" configurations for Solr's {@link org.apache.solr.core.CoreContainer} and
+ * {@link SolrCore} instances
+ */
+public class JerseyApplications {
+
+ public static class CoreContainerApp extends ResourceConfig {
+ public CoreContainerApp(PluginBag.JerseyMetricsLookupRegistry beanRegistry) {
+ super();
+
+ // Authentication and authorization
+ register(SolrRequestAuthorizer.class);
+
+ // Request and response serialization/deserialization
+ // TODO: could these be singletons to save per-request object creations?
+ register(MessageBodyWriters.JavabinMessageBodyWriter.class);
+ register(MessageBodyWriters.XmlMessageBodyWriter.class);
+ register(MessageBodyWriters.CsvMessageBodyWriter.class);
+ register(SolrJacksonMapper.class);
+
+ // Request lifecycle logic
+ register(CatchAllExceptionMapper.class);
+ register(RequestMetricHandling.PreRequestMetricsFilter.class);
+ register(RequestMetricHandling.PostRequestMetricsFilter.class);
+ register(PostRequestDecorationFilter.class);
+ register(
+ new AbstractBinder() {
+ @Override
+ protected void configure() {
+ bindFactory(new MetricBeanFactory(beanRegistry))
+ .to(PluginBag.JerseyMetricsLookupRegistry.class)
+ .in(Singleton.class);
+ }
+ });
+
+ // Logging - disabled by default but useful for debugging Jersey execution
+ // setProperties(
+ // Map.of(
+ // "jersey.config.server.tracing.type",
+ // "ALL",
+ // "jersey.config.server.tracing.threshold",
+ // "VERBOSE"));
+ }
+ }
+
+ public static class SolrCoreApp extends CoreContainerApp {
+
+ public SolrCoreApp(SolrCore solrCore, PluginBag.JerseyMetricsLookupRegistry beanRegistry) {
+ super(beanRegistry);
+
+ // Dependency Injection for Jersey resources
+ register(
+ new AbstractBinder() {
+ @Override
+ protected void configure() {
+ bindFactory(new SolrCoreFactory(solrCore)).to(SolrCore.class).in(Singleton.class);
+ }
+ });
+ }
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.java b/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.java
new file mode 100644
index 00000000000..ea9022cb38c
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.java
@@ -0,0 +1,134 @@
+/*
+ * 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.jersey;
+
+import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;
+import static org.apache.solr.jersey.RequestContextKeys.SOLR_QUERY_REQUEST;
+import static org.apache.solr.jersey.RequestContextKeys.SOLR_QUERY_RESPONSE;
+import static org.apache.solr.response.QueryResponseWriter.CONTENT_TYPE_TEXT_UTF8;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.apache.solr.handler.api.V2ApiUtils;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.response.BinaryResponseWriter;
+import org.apache.solr.response.CSVResponseWriter;
+import org.apache.solr.response.QueryResponseWriter;
+import org.apache.solr.response.QueryResponseWriterUtil;
+import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.response.XMLResponseWriter;
+
+/**
+ * A collection of thin Jersey shims around Solr's existing {@link QueryResponseWriter} interface
+ */
+public class MessageBodyWriters {
+
+ // Jersey has a default MessageBodyWriter for JSON so we don't need to declare one here
+ // Which other response-writer formats are worth carrying forward into v2?
+
+ @Produces(MediaType.APPLICATION_XML)
+ public static class XmlMessageBodyWriter extends BaseMessageBodyWriter
+ implements MessageBodyWriter<JacksonReflectMapWriter> {
+ @Override
+ public QueryResponseWriter createResponseWriter() {
+ return new XMLResponseWriter();
+ }
+
+ @Override
+ public String getSupportedMediaType() {
+ return MediaType.APPLICATION_XML;
+ }
+ }
+
+ @Produces(BINARY_CONTENT_TYPE_V2)
+ public static class JavabinMessageBodyWriter extends BaseMessageBodyWriter
+ implements MessageBodyWriter<JacksonReflectMapWriter> {
+ @Override
+ public QueryResponseWriter createResponseWriter() {
+ return new BinaryResponseWriter();
+ }
+
+ @Override
+ public String getSupportedMediaType() {
+ return BINARY_CONTENT_TYPE_V2;
+ }
+ }
+
+ @Produces(CONTENT_TYPE_TEXT_UTF8)
+ public static class CsvMessageBodyWriter extends BaseMessageBodyWriter
+ implements MessageBodyWriter<JacksonReflectMapWriter> {
+ @Override
+ public QueryResponseWriter createResponseWriter() {
+ return new CSVResponseWriter();
+ }
+
+ @Override
+ public String getSupportedMediaType() {
+ return CONTENT_TYPE_TEXT_UTF8;
+ }
+ }
+
+ public abstract static class BaseMessageBodyWriter
+ implements MessageBodyWriter<JacksonReflectMapWriter> {
+
+ @Context protected ResourceContext resourceContext;
+ private final QueryResponseWriter responseWriter = createResponseWriter();
+
+ public abstract QueryResponseWriter createResponseWriter();
+
+ public abstract String getSupportedMediaType();
+
+ @Override
+ public boolean isWriteable(
+ Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ return mediaType.equals(MediaType.valueOf(getSupportedMediaType()));
+ }
+
+ @Override
+ public void writeTo(
+ JacksonReflectMapWriter reflectMapWriter,
+ Class<?> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType,
+ MultivaluedMap<String, Object> httpHeaders,
+ OutputStream entityStream)
+ throws IOException, WebApplicationException {
+ final ContainerRequestContext requestContext =
+ resourceContext.getResource(ContainerRequestContext.class);
+ final SolrQueryRequest solrQueryRequest =
+ (SolrQueryRequest) requestContext.getProperty(SOLR_QUERY_REQUEST);
+ final SolrQueryResponse solrQueryResponse =
+ (SolrQueryResponse) requestContext.getProperty(SOLR_QUERY_RESPONSE);
+
+ V2ApiUtils.squashIntoSolrResponseWithHeader(solrQueryResponse, reflectMapWriter);
+ QueryResponseWriterUtil.writeQueryResponse(
+ entityStream, responseWriter, solrQueryRequest, solrQueryResponse, mediaType.toString());
+ }
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/jersey/MetricBeanFactory.java b/solr/core/src/java/org/apache/solr/jersey/MetricBeanFactory.java
new file mode 100644
index 00000000000..c23851359d9
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/MetricBeanFactory.java
@@ -0,0 +1,55 @@
+/*
+ * 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.jersey;
+
+import org.apache.solr.core.PluginBag;
+import org.glassfish.hk2.api.Factory;
+
+/**
+ * Factory to inject JerseyMetricsLookupRegistry instances into Jersey resources and filters.
+ *
+ * <p>Currently, Jersey resources that have a corresponding v1 API produce the same metrics as their
+ * v1 equivalent and rely on the v1 requestHandler instance to do so. Solr facilitates this by
+ * building a map of the Jersey resource to requestHandler mapping (a {@link
+ * org.apache.solr.core.PluginBag.JerseyMetricsLookupRegistry}), and injecting it into the pre- and
+ * post- Jersey filters that handle metrics.
+ *
+ * <p>This isn't ideal, as requestHandler's don't really "fit" conceptually here. But it's
+ * unavoidable while we want our v2 APIs to exactly match the metrics produced by v1 calls.
+ *
+ * @see RequestMetricHandling.PreRequestMetricsFilter
+ * @see RequestMetricHandling.PostRequestMetricsFilter
+ */
+public class MetricBeanFactory implements Factory<PluginBag.JerseyMetricsLookupRegistry> {
+
+ private final PluginBag.JerseyMetricsLookupRegistry metricsLookupRegistry;
+
+ public MetricBeanFactory(PluginBag.JerseyMetricsLookupRegistry metricsLookupRegistry) {
+ this.metricsLookupRegistry = metricsLookupRegistry;
+ }
+
+ @Override
+ public PluginBag.JerseyMetricsLookupRegistry provide() {
+ return metricsLookupRegistry;
+ }
+
+ @Override
+ public void dispose(PluginBag.JerseyMetricsLookupRegistry instance) {
+ /* No-op */
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/api/ApiSupport.java b/solr/core/src/java/org/apache/solr/jersey/PermissionName.java
similarity index 52%
copy from solr/core/src/java/org/apache/solr/api/ApiSupport.java
copy to solr/core/src/java/org/apache/solr/jersey/PermissionName.java
index 7be5f683fc4..da185cef663 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiSupport.java
+++ b/solr/core/src/java/org/apache/solr/jersey/PermissionName.java
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -15,27 +15,22 @@
* limitations under the License.
*/
-package org.apache.solr.api;
+package org.apache.solr.jersey;
-import java.util.Collection;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.apache.solr.api.EndPoint;
+import org.apache.solr.security.PermissionNameProvider;
-/** The interface that is implemented by a request handler to support the V2 end point */
-public interface ApiSupport {
-
- /**
- * It is possible to support multiple v2 apis by a single requesthandler
- *
- * @return the list of v2 api implementations
- */
- Collection<Api> getApis();
-
- /** Whether this should be made available at the regular legacy path */
- default Boolean registerV1() {
- return Boolean.TRUE;
- }
-
- /** Whether this request handler must be made available at the /v2/ path */
- default Boolean registerV2() {
- return Boolean.FALSE;
- }
+/**
+ * Associates the resource method with a particular {@link PermissionNameProvider} value.
+ *
+ * <p>Analogous to {@link EndPoint#permission()} in the current v2 annotation framework.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface PermissionName {
+ PermissionNameProvider.Name value();
}
diff --git a/solr/core/src/java/org/apache/solr/jersey/PostRequestDecorationFilter.java b/solr/core/src/java/org/apache/solr/jersey/PostRequestDecorationFilter.java
new file mode 100644
index 00000000000..3f5dd3291ac
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/PostRequestDecorationFilter.java
@@ -0,0 +1,59 @@
+/*
+ * 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.jersey;
+
+import static org.apache.solr.jersey.RequestContextKeys.SOLR_QUERY_REQUEST;
+
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.request.SolrRequestHandler;
+import org.apache.solr.response.SolrQueryResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Applies standard post-processing decorations to a {@link SolrJerseyResponse} that are needed on
+ * all responses.
+ *
+ * @see SolrCore#postDecorateResponse(SolrRequestHandler, SolrQueryRequest, SolrQueryResponse)
+ */
+public class PostRequestDecorationFilter implements ContainerResponseFilter {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @Override
+ public void filter(
+ ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+ throws IOException {
+ final SolrQueryRequest solrQueryRequest =
+ (SolrQueryRequest) requestContext.getProperty(SOLR_QUERY_REQUEST);
+ if (!responseContext.hasEntity()
+ || !SolrJerseyResponse.class.isInstance(responseContext.getEntity())) {
+ log.debug("Skipping QTime assignment because response was not a SolrJerseyResponse");
+ return;
+ }
+
+ final SolrJerseyResponse response = (SolrJerseyResponse) responseContext.getEntity();
+ response.responseHeader.qTime = Math.round(solrQueryRequest.getRequestTimer().getTime());
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.java b/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.java
new file mode 100644
index 00000000000..18a2aad2865
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.java
@@ -0,0 +1,52 @@
+/*
+ * 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.jersey;
+
+import com.codahale.metrics.Timer;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.container.ContainerRequestContext;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.core.CoreContainer;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.handler.RequestHandlerBase;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.security.AuthorizationContext;
+
+/**
+ * Keys used to store and retrieve values from the Jersey request context.
+ *
+ * <p>Properties are generally set in V2HttpCall's 'invokeJerseyRequest' and retrieved in individual
+ * {@link javax.ws.rs.container.ContainerRequestFilter}s using {@link
+ * ContainerRequestContext#getProperty(String)}
+ */
+public interface RequestContextKeys {
+ String HTTP_SERVLET_REQ = HttpServletRequest.class.getName();
+ String HTTP_SERVLET_RSP = HttpServletResponse.class.getName();
+ String SOLR_QUERY_REQUEST = SolrQueryRequest.class.getName();
+ String SOLR_QUERY_RESPONSE = SolrQueryResponse.class.getName();
+ String CORE_CONTAINER = CoreContainer.class.getName();
+ String SOLR_CORE = SolrCore.class.getName();
+ String REQUEST_TYPE = AuthorizationContext.RequestType.class.getName();
+ String SOLR_PARAMS = SolrParams.class.getName();
+ String COLLECTION_LIST = "collection_name_list";
+ String HANDLER_METRICS = RequestHandlerBase.HandlerMetrics.class.getName();
+ String TIMER = Timer.Context.class.getName();
+ String SOLR_JERSEY_RESPONSE = SolrJerseyResponse.class.getName();
+}
diff --git a/solr/core/src/java/org/apache/solr/jersey/RequestMetricHandling.java b/solr/core/src/java/org/apache/solr/jersey/RequestMetricHandling.java
new file mode 100644
index 00000000000..bf09ce8d693
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/RequestMetricHandling.java
@@ -0,0 +1,114 @@
+/*
+ * 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.jersey;
+
+import static org.apache.solr.jersey.RequestContextKeys.HANDLER_METRICS;
+import static org.apache.solr.jersey.RequestContextKeys.SOLR_QUERY_REQUEST;
+import static org.apache.solr.jersey.RequestContextKeys.TIMER;
+
+import com.codahale.metrics.Timer;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import javax.inject.Inject;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Context;
+import org.apache.solr.core.PluginBag;
+import org.apache.solr.handler.RequestHandlerBase;
+import org.apache.solr.request.SolrQueryRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A request and response filter used to initialize and report per-request metrics.
+ *
+ * <p>Currently, JAX-RS v2 APIs rely on a {@link
+ * org.apache.solr.handler.RequestHandlerBase.HandlerMetrics} instance from an associated request
+ * handler.
+ */
+public class RequestMetricHandling {
+
+ /**
+ * Sets up the metrics-context for individual requests
+ *
+ * <p>Looks up the requestHandler associated with the particular Jersey request and attaches its
+ * {@link org.apache.solr.handler.RequestHandlerBase.HandlerMetrics} to the request context to be
+ * manipulated by other pre- and post-request filters in this chain.
+ */
+ public static class PreRequestMetricsFilter implements ContainerRequestFilter {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @Context private ResourceInfo resourceInfo;
+
+ private PluginBag.JerseyMetricsLookupRegistry beanRegistry;
+
+ @Inject
+ public PreRequestMetricsFilter(PluginBag.JerseyMetricsLookupRegistry beanRegistry) {
+ this.beanRegistry = beanRegistry;
+ }
+
+ @Override
+ public void filter(ContainerRequestContext requestContext) throws IOException {
+ final RequestHandlerBase handlerBase = beanRegistry.get(resourceInfo.getResourceClass());
+ if (handlerBase == null) {
+ log.debug("No handler found for request {}", requestContext);
+ return;
+ }
+
+ final SolrQueryRequest solrQueryRequest =
+ (SolrQueryRequest) requestContext.getProperty(SOLR_QUERY_REQUEST);
+ final RequestHandlerBase.HandlerMetrics metrics =
+ handlerBase.getMetricsForThisRequest(solrQueryRequest);
+
+ requestContext.setProperty(HANDLER_METRICS, metrics);
+ requestContext.setProperty(TIMER, metrics.requestTimes.time());
+ metrics.requests.inc();
+ }
+ }
+
+ /** Adjusts post-request metrics (timing, etc.)for individual Jersey requests. */
+ public static class PostRequestMetricsFilter implements ContainerResponseFilter {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @Override
+ public void filter(
+ ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+ throws IOException {
+ final RequestHandlerBase.HandlerMetrics metrics =
+ (RequestHandlerBase.HandlerMetrics) requestContext.getProperty(HANDLER_METRICS);
+ if (metrics == null) return;
+
+ // Increment the timeout count if responseHeader indicates a timeout
+ if (responseContext.hasEntity()
+ && SolrJerseyResponse.class.isInstance(responseContext.getEntity())) {
+ final SolrJerseyResponse response = (SolrJerseyResponse) responseContext.getEntity();
+ if (Boolean.TRUE.equals(response.responseHeader.partialResults)) {
+ metrics.numTimeouts.mark();
+ }
+ } else {
+ log.debug("Skipping partialResults check because entity was not SolrJerseyResponse");
+ }
+
+ final Timer.Context timer = (Timer.Context) requestContext.getProperty(TIMER);
+ metrics.totalTime.inc(timer.stop());
+ }
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/api/ApiSupport.java b/solr/core/src/java/org/apache/solr/jersey/SolrCoreFactory.java
similarity index 53%
copy from solr/core/src/java/org/apache/solr/api/ApiSupport.java
copy to solr/core/src/java/org/apache/solr/jersey/SolrCoreFactory.java
index 7be5f683fc4..ad51a132f15 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiSupport.java
+++ b/solr/core/src/java/org/apache/solr/jersey/SolrCoreFactory.java
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -15,27 +15,30 @@
* limitations under the License.
*/
-package org.apache.solr.api;
+package org.apache.solr.jersey;
-import java.util.Collection;
+import org.apache.solr.core.SolrCore;
+import org.glassfish.hk2.api.Factory;
-/** The interface that is implemented by a request handler to support the V2 end point */
-public interface ApiSupport {
+/**
+ * Allows the SolrCore germane to a particular request to be injected into individual resource
+ * instances at call-time.
+ */
+public class SolrCoreFactory implements Factory<SolrCore> {
+
+ private final SolrCore solrCore;
- /**
- * It is possible to support multiple v2 apis by a single requesthandler
- *
- * @return the list of v2 api implementations
- */
- Collection<Api> getApis();
+ public SolrCoreFactory(SolrCore solrCore) {
+ this.solrCore = solrCore;
+ }
- /** Whether this should be made available at the regular legacy path */
- default Boolean registerV1() {
- return Boolean.TRUE;
+ @Override
+ public SolrCore provide() {
+ return solrCore;
}
- /** Whether this request handler must be made available at the /v2/ path */
- default Boolean registerV2() {
- return Boolean.FALSE;
+ @Override
+ public void dispose(SolrCore instance) {
+ /* No-op */
}
}
diff --git a/solr/core/src/java/org/apache/solr/api/ApiSupport.java b/solr/core/src/java/org/apache/solr/jersey/SolrJacksonMapper.java
similarity index 53%
copy from solr/core/src/java/org/apache/solr/api/ApiSupport.java
copy to solr/core/src/java/org/apache/solr/jersey/SolrJacksonMapper.java
index 7be5f683fc4..94d8e090b21 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiSupport.java
+++ b/solr/core/src/java/org/apache/solr/jersey/SolrJacksonMapper.java
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -15,27 +15,18 @@
* limitations under the License.
*/
-package org.apache.solr.api;
+package org.apache.solr.jersey;
-import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Provider;
-/** The interface that is implemented by a request handler to support the V2 end point */
-public interface ApiSupport {
-
- /**
- * It is possible to support multiple v2 apis by a single requesthandler
- *
- * @return the list of v2 api implementations
- */
- Collection<Api> getApis();
-
- /** Whether this should be made available at the regular legacy path */
- default Boolean registerV1() {
- return Boolean.TRUE;
- }
-
- /** Whether this request handler must be made available at the /v2/ path */
- default Boolean registerV2() {
- return Boolean.FALSE;
+/** Customizes the ObjectMapper settings used for serialization/deserialization in Jersey */
+@Provider
+public class SolrJacksonMapper implements ContextResolver<ObjectMapper> {
+ @Override
+ public ObjectMapper getContext(Class<?> type) {
+ return new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
}
}
diff --git a/solr/core/src/java/org/apache/solr/jersey/SolrJerseyResponse.java b/solr/core/src/java/org/apache/solr/jersey/SolrJerseyResponse.java
new file mode 100644
index 00000000000..770fc1eec53
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/SolrJerseyResponse.java
@@ -0,0 +1,62 @@
+/*
+ * 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.jersey;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Base response-body POJO to be used by Jersey resources.
+ *
+ * <p>Contains fields common to all Solr API responses, particularly the 'responseHeader' and
+ * 'error' fields.
+ */
+public class SolrJerseyResponse implements JacksonReflectMapWriter {
+
+ @JsonProperty("responseHeader")
+ public ResponseHeader responseHeader = new ResponseHeader();
+
+ @JsonProperty("error")
+ public ErrorInfo error;
+
+ public static class ResponseHeader implements JacksonReflectMapWriter {
+ @JsonProperty("status")
+ public int status;
+
+ @JsonProperty("QTime")
+ public long qTime;
+
+ @JsonProperty("partialResults")
+ public Boolean partialResults;
+
+ private Map<String, Object> unknownFields = new HashMap<>();
+
+ @JsonAnyGetter
+ public Map<String, Object> unknownProperties() {
+ return unknownFields;
+ }
+
+ @JsonAnySetter
+ public void setUnknownProperty(String field, Object value) {
+ unknownFields.put(field, value);
+ }
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java b/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java
new file mode 100644
index 00000000000..362ad511057
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java
@@ -0,0 +1,129 @@
+/*
+ * 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.jersey;
+
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.core.CoreContainer;
+import org.apache.solr.security.AuthorizationContext;
+import org.apache.solr.security.AuthorizationUtils;
+import org.apache.solr.security.HttpServletAuthorizationContext;
+import org.apache.solr.security.PermissionNameProvider;
+import org.apache.solr.servlet.ServletUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A JAX-RS request filter that blocks or allows requests based on the authorization plugin
+ * configured in security.json.
+ */
+@Provider
+public class SolrRequestAuthorizer implements ContainerRequestFilter {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @Context private ResourceInfo resourceInfo;
+
+ public SolrRequestAuthorizer() {
+ log.info("Creating a new SolrRequestAuthorizer");
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void filter(ContainerRequestContext requestContext) throws IOException {
+ final CoreContainer coreContainer =
+ (CoreContainer) requestContext.getProperty(RequestContextKeys.CORE_CONTAINER);
+ final HttpServletRequest servletRequest =
+ (HttpServletRequest) requestContext.getProperty(RequestContextKeys.HTTP_SERVLET_REQ);
+ final HttpServletResponse servletResponse =
+ (HttpServletResponse) requestContext.getProperty(RequestContextKeys.HTTP_SERVLET_RSP);
+ final AuthorizationContext.RequestType requestType =
+ (AuthorizationContext.RequestType)
+ requestContext.getProperty(RequestContextKeys.REQUEST_TYPE);
+ final List<String> collectionNames =
+ (List<String>) requestContext.getProperty(RequestContextKeys.COLLECTION_LIST);
+ final SolrParams solrParams =
+ (SolrParams) requestContext.getProperty(RequestContextKeys.SOLR_PARAMS);
+
+ /*
+ * HttpSolrCall has more involved logic to check whether a request requires authorization, but most of that
+ * revolves around checking for (1) static paths (e.g. index.html) or (2) HttpSolrCall 'action's that don't need
+ * authorization (e.g. request-forwarding)
+ *
+ * Since we don't invoke Jersey code in those particular cases we can ignore those checks here.
+ */
+ if (coreContainer.getAuthorizationPlugin() == null) {
+ return;
+ }
+ final AuthorizationContext authzContext =
+ getAuthzContext(servletRequest, requestType, collectionNames, solrParams);
+ log.debug("Attempting authz with context {}", authzContext);
+ AuthorizationUtils.AuthorizationFailure authzFailure =
+ AuthorizationUtils.authorize(servletRequest, servletResponse, coreContainer, authzContext);
+ if (authzFailure != null) {
+ final Response failureResponse =
+ Response.status(authzFailure.getStatusCode()).entity(authzFailure.getMessage()).build();
+ requestContext.abortWith(failureResponse);
+ }
+ }
+
+ private AuthorizationContext getAuthzContext(
+ HttpServletRequest servletRequest,
+ AuthorizationContext.RequestType reqType,
+ List<String> collectionNames,
+ SolrParams solrParams) {
+ return new HttpServletAuthorizationContext(servletRequest) {
+
+ @Override
+ public List<CollectionRequest> getCollectionRequests() {
+ return AuthorizationUtils.getCollectionRequests(
+ ServletUtils.getPathAfterContext(servletRequest), collectionNames, solrParams);
+ }
+
+ @Override
+ public Object getHandler() {
+ return new PermissionNameProvider() {
+ @Override
+ public Name getPermissionName(AuthorizationContext request) {
+ return resourceInfo.getResourceMethod().getAnnotation(PermissionName.class).value();
+ }
+ };
+ }
+
+ @Override
+ public SolrParams getParams() {
+ return solrParams;
+ }
+
+ @Override
+ public RequestType getRequestType() {
+ return reqType;
+ }
+ };
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/jersey/container/ContainerRequestUtils.java b/solr/core/src/java/org/apache/solr/jersey/container/ContainerRequestUtils.java
new file mode 100644
index 00000000000..0d944f2cc0f
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/container/ContainerRequestUtils.java
@@ -0,0 +1,139 @@
+/*
+ * 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.jersey.container;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.Principal;
+import java.util.Enumeration;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.SecurityContext;
+import org.glassfish.jersey.internal.MapPropertiesDelegate;
+import org.glassfish.jersey.server.ContainerRequest;
+import org.glassfish.jersey.server.internal.ContainerUtils;
+import org.glassfish.jersey.server.spi.ContainerResponseWriter;
+
+/**
+ * Utility methods for creating and populating a {@link
+ * org.glassfish.jersey.server.ContainerRequest} for use with Jersey {@link
+ * org.glassfish.jersey.server.ApplicationHandler}s
+ */
+public class ContainerRequestUtils {
+ private ContainerRequestUtils() {
+ /* Private ctor prevents instantiation */
+ }
+
+ // We don't rely on any of Jersey's authc/z features so we pass in this empty context for
+ // all requests.
+ public static final SecurityContext DEFAULT_SECURITY_CONTEXT =
+ new SecurityContext() {
+ public boolean isUserInRole(String role) {
+ return false;
+ }
+
+ public boolean isSecure() {
+ return false;
+ }
+
+ public Principal getUserPrincipal() {
+ return null;
+ }
+
+ public String getAuthenticationScheme() {
+ return null;
+ }
+ };
+
+ /**
+ * Creates a {@link ContainerRequest}
+ *
+ * <p>Implementation guided by code in 'jersey-container-jetty-http's JettyHttpContainer class.
+ */
+ public static ContainerRequest createContainerRequest(
+ HttpServletRequest httpServletRequest,
+ HttpServletResponse httpServletResponse,
+ Configuration appConfig) {
+ final ContainerResponseWriter responseWriter =
+ new JettyBridgeResponseWriter(httpServletResponse);
+ try {
+ final URI baseUri = getBaseUri(httpServletRequest);
+ final URI requestUri = getRequestUri(httpServletRequest, baseUri);
+ final ContainerRequest requestContext =
+ new ContainerRequest(
+ baseUri,
+ requestUri,
+ httpServletRequest.getMethod(),
+ DEFAULT_SECURITY_CONTEXT,
+ new MapPropertiesDelegate(),
+ appConfig);
+ requestContext.setEntityStream(httpServletRequest.getInputStream());
+ final Enumeration<String> headerNames = httpServletRequest.getHeaderNames();
+ while (headerNames.hasMoreElements()) {
+ final String headerName = headerNames.nextElement();
+ String headerValue = httpServletRequest.getHeader(headerName);
+ requestContext.headers(headerName, headerValue == null ? "" : headerValue);
+ }
+ requestContext.setWriter(responseWriter);
+ return requestContext;
+ } catch (Exception e) {
+ // TODO Should we handle URISyntaxException any differently here?
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static URI getBaseUri(HttpServletRequest httpServletRequest) {
+ try {
+ return new URI(
+ httpServletRequest.getScheme(),
+ null,
+ httpServletRequest.getServerName(),
+ httpServletRequest.getServerPort(),
+ "/",
+ null,
+ null);
+ } catch (final URISyntaxException ex) {
+ throw new IllegalArgumentException(ex);
+ }
+ }
+
+ private static URI getRequestUri(HttpServletRequest httpServletRequest, URI baseUri)
+ throws URISyntaxException {
+ final String serverAddress = getServerAddress(baseUri);
+ String uri = httpServletRequest.getRequestURI();
+ // Jersey is only used for v2 APIs so we have no need of the janky v2 suffixing (and it impedes
+ // matching) - remove if present.
+ uri = uri.replace("/solr/____v2", "");
+
+ final String queryString = httpServletRequest.getQueryString();
+ if (queryString != null) {
+ uri = uri + "?" + ContainerUtils.encodeUnsafeCharacters(queryString);
+ }
+
+ return new URI(serverAddress + uri);
+ }
+
+ private static String getServerAddress(URI baseUri) {
+ String serverAddress = baseUri.toString();
+ if (serverAddress.charAt(serverAddress.length() - 1) == '/') {
+ return serverAddress.substring(0, serverAddress.length() - 1);
+ }
+ return serverAddress;
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java b/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java
new file mode 100644
index 00000000000..d80e9623151
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java
@@ -0,0 +1,109 @@
+/*
+ * 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.jersey.container;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.invoke.MethodHandles;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.servlet.http.HttpServletResponse;
+import org.glassfish.jersey.server.ContainerException;
+import org.glassfish.jersey.server.ContainerResponse;
+import org.glassfish.jersey.server.spi.ContainerResponseWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A ResponseWriter which copies that output of JAX-RS computation over to {@link
+ * HttpServletResponse} object used by the Jetty server.
+ *
+ * <p>Since we're not running Jersey as a full server or as a servlet that Jetty knows about, we
+ * need to connect the response Jersey outputs with the actual objects that Jetty sends back to
+ * clients.
+ *
+ * <p>Inspired and partially copied from the JettyHttpContainer.ResponseWriter class available in
+ * the jersey-container-jetty-http artifact.
+ */
+public class JettyBridgeResponseWriter implements ContainerResponseWriter {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ private final HttpServletResponse httpServletResponse;
+
+ public JettyBridgeResponseWriter(HttpServletResponse httpServletResponse) {
+ this.httpServletResponse = httpServletResponse;
+ }
+
+ @Override
+ public OutputStream writeResponseStatusAndHeaders(
+ final long contentLength, final ContainerResponse context) throws ContainerException {
+ final javax.ws.rs.core.Response.StatusType statusInfo = context.getStatusInfo();
+ httpServletResponse.setStatus(statusInfo.getStatusCode());
+
+ if (contentLength != -1 && contentLength < Integer.MAX_VALUE) {
+ httpServletResponse.setContentLength((int) contentLength);
+ }
+ for (final Map.Entry<String, List<String>> e : context.getStringHeaders().entrySet()) {
+ for (final String value : e.getValue()) {
+ httpServletResponse.addHeader(e.getKey(), value);
+ }
+ }
+
+ try {
+ return httpServletResponse.getOutputStream();
+ } catch (final IOException ioe) {
+ throw new ContainerException("Error during writing out the response headers.", ioe);
+ }
+ }
+
+ @Override
+ public boolean suspend(
+ final long timeOut,
+ final TimeUnit timeUnit,
+ final ContainerResponseWriter.TimeoutHandler timeoutHandler) {
+ // I don't think we can (or should) do anything here as the surrounding servlet filter will
+ // handle this on its own.
+ return true;
+ }
+
+ @Override
+ public void setSuspendTimeout(final long timeOut, final TimeUnit timeUnit)
+ throws IllegalStateException {
+ // I don't think we can (or should) do anything here as the surrounding servlet filter will
+ // handle this on its own.
+ }
+
+ @Override
+ public void commit() {
+ // I don't think we can (or should) do anything here as the surrounding servlet filter will
+ // handle this on its own.
+ }
+
+ @Override
+ public void failure(final Throwable error) {
+ // We don't (or shouldn't) do anything here, as the surrounding servlet filter handles this on
+ // its own.
+ }
+
+ @Override
+ public boolean enableResponseBuffering() {
+ return false;
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/api/ApiSupport.java b/solr/core/src/java/org/apache/solr/jersey/container/package-info.java
similarity index 51%
copy from solr/core/src/java/org/apache/solr/api/ApiSupport.java
copy to solr/core/src/java/org/apache/solr/jersey/container/package-info.java
index 7be5f683fc4..5abde0ce25b 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiSupport.java
+++ b/solr/core/src/java/org/apache/solr/jersey/container/package-info.java
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -15,27 +15,14 @@
* limitations under the License.
*/
-package org.apache.solr.api;
-
-import java.util.Collection;
-
-/** The interface that is implemented by a request handler to support the V2 end point */
-public interface ApiSupport {
-
- /**
- * It is possible to support multiple v2 apis by a single requesthandler
- *
- * @return the list of v2 api implementations
- */
- Collection<Api> getApis();
-
- /** Whether this should be made available at the regular legacy path */
- default Boolean registerV1() {
- return Boolean.TRUE;
- }
-
- /** Whether this request handler must be made available at the /v2/ path */
- default Boolean registerV2() {
- return Boolean.FALSE;
- }
-}
+/**
+ * Adapter code used to convert the native Jetty request/response abstractions into the objects
+ * required by Jersey
+ *
+ * <p>Much of the code in this package is inspired or copied from the jersey-container-jetty-http
+ * artifact, which greatly simplifies deploying a Jersey application in its own Jetty servlet or
+ * servlet filter. Solr cannot currently take advantage of this due to the interconnectedness of its
+ * filter logic (i.e. everything running in one massive filter). However, if this is remedied in the
+ * future we should be able to get rid of most or all of the adapter code in this package.
+ */
+package org.apache.solr.jersey.container;
diff --git a/solr/core/src/java/org/apache/solr/api/ApiSupport.java b/solr/core/src/java/org/apache/solr/jersey/package-info.java
similarity index 52%
copy from solr/core/src/java/org/apache/solr/api/ApiSupport.java
copy to solr/core/src/java/org/apache/solr/jersey/package-info.java
index 7be5f683fc4..2ad6bc71a66 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiSupport.java
+++ b/solr/core/src/java/org/apache/solr/jersey/package-info.java
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -15,27 +15,5 @@
* limitations under the License.
*/
-package org.apache.solr.api;
-
-import java.util.Collection;
-
-/** The interface that is implemented by a request handler to support the V2 end point */
-public interface ApiSupport {
-
- /**
- * It is possible to support multiple v2 apis by a single requesthandler
- *
- * @return the list of v2 api implementations
- */
- Collection<Api> getApis();
-
- /** Whether this should be made available at the regular legacy path */
- default Boolean registerV1() {
- return Boolean.TRUE;
- }
-
- /** Whether this request handler must be made available at the /v2/ path */
- default Boolean registerV2() {
- return Boolean.FALSE;
- }
-}
+/** Jersey integration code */
+package org.apache.solr.jersey;
diff --git a/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java b/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java
new file mode 100644
index 00000000000..dda359f370d
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java
@@ -0,0 +1,157 @@
+/*
+ * 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.security;
+
+import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATE;
+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETE;
+import static org.apache.solr.common.params.CollectionParams.CollectionAction.RELOAD;
+import static org.apache.solr.servlet.HttpSolrCall.shouldAudit;
+
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.http.HttpStatus;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.core.CoreContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AuthorizationUtils {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ private AuthorizationUtils() {
+ /* Private ctor prevents instantiation */
+ }
+
+ public static class AuthorizationFailure {
+ private final int statusCode;
+ private final String message;
+
+ public AuthorizationFailure(int statusCode, String message) {
+ this.statusCode = statusCode;
+ this.message = message;
+ }
+
+ public int getStatusCode() {
+ return statusCode;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+ }
+
+ public static AuthorizationFailure authorize(
+ HttpServletRequest servletReq,
+ HttpServletResponse response,
+ CoreContainer cores,
+ AuthorizationContext context)
+ throws IOException {
+ log.debug("AuthorizationContext : {}", context);
+ final AuthorizationPlugin authzPlugin = cores.getAuthorizationPlugin();
+ if (authzPlugin == null) {
+ return null; // A 'null' failure retval indicates success
+ }
+ AuthorizationResponse authResponse = authzPlugin.authorize(context);
+ int statusCode = authResponse.statusCode;
+
+ if (statusCode == AuthorizationResponse.PROMPT.statusCode) {
+ @SuppressWarnings({"unchecked"})
+ Map<String, String> headers =
+ (Map<String, String>) servletReq.getAttribute(AuthenticationPlugin.class.getName());
+ if (headers != null) {
+ for (Map.Entry<String, String> e : headers.entrySet())
+ response.setHeader(e.getKey(), e.getValue());
+ }
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "USER_REQUIRED {} {}",
+ servletReq.getHeader("Authorization"),
+ servletReq.getUserPrincipal());
+ }
+ if (shouldAudit(cores, AuditEvent.EventType.REJECTED)) {
+ cores
+ .getAuditLoggerPlugin()
+ .doAudit(new AuditEvent(AuditEvent.EventType.REJECTED, servletReq, context));
+ }
+ return new AuthorizationFailure(
+ statusCode, "Authentication failed, Response code: " + statusCode);
+ }
+ if (statusCode == AuthorizationResponse.FORBIDDEN.statusCode) {
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "UNAUTHORIZED auth header {} context : {}, msg: {}",
+ servletReq.getHeader("Authorization"),
+ context,
+ authResponse.getMessage()); // nowarn
+ }
+ if (shouldAudit(cores, AuditEvent.EventType.UNAUTHORIZED)) {
+ cores
+ .getAuditLoggerPlugin()
+ .doAudit(new AuditEvent(AuditEvent.EventType.UNAUTHORIZED, servletReq, context));
+ }
+ return new AuthorizationFailure(
+ statusCode, "Unauthorized request, Response code: " + statusCode);
+ }
+ if (!(statusCode == HttpStatus.SC_ACCEPTED) && !(statusCode == HttpStatus.SC_OK)) {
+ log.warn(
+ "ERROR {} during authentication: {}", statusCode, authResponse.getMessage()); // nowarn
+ if (shouldAudit(cores, AuditEvent.EventType.ERROR)) {
+ cores
+ .getAuditLoggerPlugin()
+ .doAudit(new AuditEvent(AuditEvent.EventType.ERROR, servletReq, context));
+ }
+ return new AuthorizationFailure(
+ statusCode, "ERROR during authorization, Response code: " + statusCode);
+ }
+
+ // No failures! Audit if necessary and return
+ if (shouldAudit(cores, AuditEvent.EventType.AUTHORIZED)) {
+ cores
+ .getAuditLoggerPlugin()
+ .doAudit(new AuditEvent(AuditEvent.EventType.AUTHORIZED, servletReq, context));
+ }
+ return null;
+ }
+
+ public static List<AuthorizationContext.CollectionRequest> getCollectionRequests(
+ String path, List<String> collectionNames, SolrParams params) {
+ final ArrayList<AuthorizationContext.CollectionRequest> collectionRequests = new ArrayList<>();
+ for (String collection : collectionNames) {
+ collectionRequests.add(new AuthorizationContext.CollectionRequest(collection));
+ }
+
+ // Extract collection name from the params in case of a Collection Admin request
+ if (path.equals("/admin/collections")) {
+ if (CREATE.isEqual(params.get("action"))
+ || RELOAD.isEqual(params.get("action"))
+ || DELETE.isEqual(params.get("action")))
+ collectionRequests.add(new AuthorizationContext.CollectionRequest(params.get("name")));
+ else if (params.get(COLLECTION_PROP) != null)
+ collectionRequests.add(
+ new AuthorizationContext.CollectionRequest(params.get(COLLECTION_PROP)));
+ }
+
+ return collectionRequests;
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/security/HttpServletAuthorizationContext.java b/solr/core/src/java/org/apache/solr/security/HttpServletAuthorizationContext.java
new file mode 100644
index 00000000000..1f34807667f
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/security/HttpServletAuthorizationContext.java
@@ -0,0 +1,90 @@
+/*
+ * 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.security;
+
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.servlet.ServletUtils;
+
+/**
+ * An {@link AuthorizationContext} implementation that delegates many methods to an underlying
+ * {@link HttpServletRequest}
+ */
+public abstract class HttpServletAuthorizationContext extends AuthorizationContext {
+
+ private final HttpServletRequest servletRequest;
+
+ public HttpServletAuthorizationContext(HttpServletRequest servletRequest) {
+ this.servletRequest = servletRequest;
+ }
+
+ @Override
+ public abstract SolrParams getParams();
+
+ @Override
+ public abstract List<CollectionRequest> getCollectionRequests();
+
+ @Override
+ public abstract RequestType getRequestType();
+
+ @Override
+ public abstract Object getHandler();
+
+ @Override
+ public String getResource() {
+ return ServletUtils.getPathAfterContext(servletRequest);
+ }
+
+ @Override
+ public String getRemoteAddr() {
+ return servletRequest.getRemoteAddr();
+ }
+
+ @Override
+ public Principal getUserPrincipal() {
+ return servletRequest.getUserPrincipal();
+ }
+
+ @Override
+ public String getUserName() {
+ return servletRequest.getRemoteUser();
+ }
+
+ @Override
+ public String getHttpHeader(String s) {
+ return servletRequest.getHeader(s);
+ }
+
+ @Override
+ public Enumeration<String> getHeaderNames() {
+ return servletRequest.getHeaderNames();
+ }
+
+ @Override
+ public String getHttpMethod() {
+ return servletRequest.getMethod();
+ }
+
+ @Override
+ public String getRemoteHost() {
+ return servletRequest.getRemoteHost();
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 50b0527f1f4..4738ec46d09 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -22,8 +22,6 @@ import static org.apache.solr.common.cloud.ZkStateReader.NODE_NAME_PROP;
import static org.apache.solr.common.cloud.ZkStateReader.REPLICATION_FACTOR;
import static org.apache.solr.common.params.CollectionAdminParams.SYSTEM_COLL;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATE;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETE;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.RELOAD;
import static org.apache.solr.common.params.CommonParams.NAME;
import static org.apache.solr.common.params.CoreAdminParams.ACTION;
import static org.apache.solr.servlet.SolrDispatchFilter.Action.ADMIN;
@@ -42,7 +40,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.lang.invoke.MethodHandles;
-import java.security.Principal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -65,7 +62,6 @@ import org.apache.http.HeaderIterator;
import org.apache.http.HttpEntity;
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.http.client.methods.HttpGet;
@@ -121,7 +117,8 @@ import org.apache.solr.security.AuthenticationPlugin;
import org.apache.solr.security.AuthorizationContext;
import org.apache.solr.security.AuthorizationContext.CollectionRequest;
import org.apache.solr.security.AuthorizationContext.RequestType;
-import org.apache.solr.security.AuthorizationResponse;
+import org.apache.solr.security.AuthorizationUtils;
+import org.apache.solr.security.HttpServletAuthorizationContext;
import org.apache.solr.security.PublicKeyHandler;
import org.apache.solr.servlet.SolrDispatchFilter.Action;
import org.apache.solr.servlet.cache.HttpCacheHeaderUtil;
@@ -179,10 +176,6 @@ public class HttpSolrCall {
// The list of SolrCloud collections if in SolrCloud (usually 1)
protected List<String> collectionsList;
- public RequestType getRequestType() {
- return requestType;
- }
-
protected RequestType requestType;
public HttpSolrCall(
@@ -488,58 +481,6 @@ public class HttpSolrCall {
}
}
- Action authorize() throws IOException {
- AuthorizationContext context = getAuthCtx();
- log.debug("AuthorizationContext : {}", context);
- AuthorizationResponse authResponse = cores.getAuthorizationPlugin().authorize(context);
- int statusCode = authResponse.statusCode;
-
- if (statusCode == AuthorizationResponse.PROMPT.statusCode) {
- @SuppressWarnings({"unchecked"})
- Map<String, String> headers =
- (Map<String, String>) getReq().getAttribute(AuthenticationPlugin.class.getName());
- if (headers != null) {
- for (Map.Entry<String, String> e : headers.entrySet())
- response.setHeader(e.getKey(), e.getValue());
- }
- if (log.isDebugEnabled()) {
- log.debug("USER_REQUIRED {} {}", req.getHeader("Authorization"), req.getUserPrincipal());
- }
- sendError(statusCode, "Authentication failed, Response code: " + statusCode);
- if (shouldAudit(EventType.REJECTED)) {
- cores.getAuditLoggerPlugin().doAudit(new AuditEvent(EventType.REJECTED, req, context));
- }
- return RETURN;
- }
- if (statusCode == AuthorizationResponse.FORBIDDEN.statusCode) {
- if (log.isDebugEnabled()) {
- log.debug(
- "UNAUTHORIZED auth header {} context : {}, msg: {}",
- req.getHeader("Authorization"),
- context,
- authResponse.getMessage()); // nowarn
- }
- sendError(statusCode, "Unauthorized request, Response code: " + statusCode);
- if (shouldAudit(EventType.UNAUTHORIZED)) {
- cores.getAuditLoggerPlugin().doAudit(new AuditEvent(EventType.UNAUTHORIZED, req, context));
- }
- return RETURN;
- }
- if (!(statusCode == HttpStatus.SC_ACCEPTED) && !(statusCode == HttpStatus.SC_OK)) {
- log.warn(
- "ERROR {} during authentication: {}", statusCode, authResponse.getMessage()); // nowarn
- sendError(statusCode, "ERROR during authorization, Response code: " + statusCode);
- if (shouldAudit(EventType.ERROR)) {
- cores.getAuditLoggerPlugin().doAudit(new AuditEvent(EventType.ERROR, req, context));
- }
- return RETURN;
- }
- if (shouldAudit(EventType.AUTHORIZED)) {
- cores.getAuditLoggerPlugin().doAudit(new AuditEvent(EventType.AUTHORIZED, req, context));
- }
- return null;
- }
-
/** This method processes the request. */
public Action call() throws IOException {
@@ -574,8 +515,13 @@ public class HttpSolrCall {
if (cores.getAuthorizationPlugin() != null
&& shouldAuthorize()
&& !(action == REMOTEQUERY || action == FORWARD)) {
- Action authorizationAction = authorize();
- if (authorizationAction != null) return authorizationAction;
+ final AuthorizationContext authzContext = getAuthCtx();
+ AuthorizationUtils.AuthorizationFailure authzFailure =
+ AuthorizationUtils.authorize(req, response, cores, authzContext);
+ if (authzFailure != null) {
+ sendError(authzFailure.getStatusCode(), authzFailure.getMessage());
+ return RETURN;
+ }
}
HttpServletResponse resp = response;
@@ -603,11 +549,11 @@ public class HttpSolrCall {
*/
SolrRequestInfo.setRequestInfo(new SolrRequestInfo(solrReq, solrRsp, action));
mustClearSolrRequestInfo = true;
- execute(solrRsp);
- if (shouldAudit()) {
+ executeCoreRequest(solrRsp);
+ if (shouldAudit(cores)) {
EventType eventType =
solrRsp.getException() == null ? EventType.COMPLETED : EventType.ERROR;
- if (shouldAudit(eventType)) {
+ if (shouldAudit(cores, eventType)) {
cores
.getAuditLoggerPlugin()
.doAudit(
@@ -688,12 +634,20 @@ public class HttpSolrCall {
span.setOperationName(verb + ":" + path);
}
- private boolean shouldAudit() {
+ public boolean shouldAudit() {
+ return shouldAudit(cores);
+ }
+
+ public boolean shouldAudit(AuditEvent.EventType eventType) {
+ return shouldAudit(cores, eventType);
+ }
+
+ public static boolean shouldAudit(CoreContainer cores) {
return cores.getAuditLoggerPlugin() != null;
}
- private boolean shouldAudit(AuditEvent.EventType eventType) {
- return shouldAudit() && cores.getAuditLoggerPlugin().shouldLog(eventType);
+ public static boolean shouldAudit(CoreContainer cores, AuditEvent.EventType eventType) {
+ return shouldAudit(cores) && cores.getAuditLoggerPlugin().shouldLog(eventType);
}
private boolean shouldAuthorize() {
@@ -879,7 +833,7 @@ public class HttpSolrCall {
}
}
- protected void execute(SolrQueryResponse rsp) {
+ protected void executeCoreRequest(SolrQueryResponse rsp) {
// a custom filter could add more stuff to the request before passing it on.
// for example: sreq.getContext().put( "HttpServletRequest", req );
// used for logging query stats in SolrCore.execute()
@@ -889,9 +843,7 @@ public class HttpSolrCall {
private void handleAdminRequest() throws IOException {
SolrQueryResponse solrResp = new SolrQueryResponse();
- SolrCore.preDecorateResponse(solrReq, solrResp);
handleAdmin(solrResp);
- SolrCore.postDecorateResponse(handler, solrReq, solrResp);
if (solrResp.getToLog().size() > 0) {
// has to come second and in it's own if to keep ./gradlew check happy.
if (log.isInfoEnabled()) {
@@ -938,7 +890,9 @@ public class HttpSolrCall {
}
protected void handleAdmin(SolrQueryResponse solrResp) {
+ SolrCore.preDecorateResponse(solrReq, solrResp);
handler.handleRequest(solrReq, solrResp);
+ SolrCore.postDecorateResponse(handler, solrReq, solrResp);
}
/**
@@ -973,7 +927,7 @@ public class HttpSolrCall {
solrReq.setParams(params);
}
- private void writeResponse(
+ protected void writeResponse(
SolrQueryResponse solrRsp, QueryResponseWriter responseWriter, Method reqMethod)
throws IOException {
try {
@@ -1205,21 +1159,8 @@ public class HttpSolrCall {
String resource = getPath();
- SolrParams params = getQueryParams();
- final ArrayList<CollectionRequest> collectionRequests = new ArrayList<>();
- for (String collection : getCollectionsList()) {
- collectionRequests.add(new CollectionRequest(collection));
- }
-
- // Extract collection name from the params in case of a Collection Admin request
- if (getPath().equals("/admin/collections")) {
- if (CREATE.isEqual(params.get("action"))
- || RELOAD.isEqual(params.get("action"))
- || DELETE.isEqual(params.get("action")))
- collectionRequests.add(new CollectionRequest(params.get("name")));
- else if (params.get(COLLECTION_PROP) != null)
- collectionRequests.add(new CollectionRequest(params.get(COLLECTION_PROP)));
- }
+ final List<CollectionRequest> collectionRequests =
+ AuthorizationUtils.getCollectionRequests(getPath(), getCollectionsList(), getQueryParams());
// Populate the request type if the request is select or update
if (requestType == RequestType.UNKNOWN) {
@@ -1228,49 +1169,25 @@ public class HttpSolrCall {
if (resource.startsWith("/update")) requestType = RequestType.WRITE;
}
- return new AuthorizationContext() {
+ return new HttpServletAuthorizationContext(getReq()) {
@Override
public SolrParams getParams() {
return null == solrReq ? null : solrReq.getParams();
}
- @Override
- public Principal getUserPrincipal() {
- return getReq().getUserPrincipal();
- }
-
- @Override
- public String getUserName() {
- return getReq().getRemoteUser();
- }
-
- @Override
- public String getHttpHeader(String s) {
- return getReq().getHeader(s);
- }
-
- @Override
- public Enumeration<String> getHeaderNames() {
- return getReq().getHeaderNames();
- }
-
@Override
public List<CollectionRequest> getCollectionRequests() {
return collectionRequests;
}
@Override
- public RequestType getRequestType() {
- return requestType;
- }
-
public String getResource() {
return path;
}
@Override
- public String getHttpMethod() {
- return getReq().getMethod();
+ public RequestType getRequestType() {
+ return requestType;
}
@Override
@@ -1297,16 +1214,6 @@ public class HttpSolrCall {
response.append(" path : ").append(path).append(" params :").append(getParams());
return response.toString();
}
-
- @Override
- public String getRemoteAddr() {
- return getReq().getRemoteAddr();
- }
-
- @Override
- public String getRemoteHost() {
- return getReq().getRemoteHost();
- }
};
}
diff --git a/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java b/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java
index 5cbff282b12..54c8f9e5d1f 100644
--- a/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java
+++ b/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java
@@ -21,6 +21,7 @@ import java.io.StringWriter;
import org.apache.solr.api.ApiBag;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.jersey.ErrorInfo;
import org.slf4j.Logger;
/** Response helper methods. */
@@ -30,10 +31,15 @@ public class ResponseUtils {
/**
* Adds the given Throwable's message to the given NamedList.
*
+ * <p>Primarily used by v1 code; v2 endpoints or dispatch code should call {@link
+ * #getTypedErrorInfo(Throwable, Logger)}
+ *
* <p>If the response code is not a regular code, the Throwable's stack trace is both logged and
* added to the given NamedList.
*
* <p>Status codes less than 100 are adjusted to be 500.
+ *
+ * @see #getTypedErrorInfo(Throwable, Logger)
*/
public static int getErrorInfo(Throwable ex, NamedList<Object> info, Logger log) {
int code = 500;
@@ -79,4 +85,54 @@ public class ResponseUtils {
info.add("code", code);
return code;
}
+
+ /**
+ * Adds information about the given Throwable to a returned {@link ErrorInfo}
+ *
+ * <p>Primarily used by v2 API code, which can handle such typed information.
+ *
+ * <p>Status codes less than 100 are adjusted to be 500.
+ *
+ * @see #getErrorInfo(Throwable, NamedList, Logger)
+ */
+ public static ErrorInfo getTypedErrorInfo(Throwable ex, Logger log) {
+ final ErrorInfo errorInfo = new ErrorInfo();
+ int code = 500;
+ if (ex instanceof SolrException) {
+ SolrException solrExc = (SolrException) ex;
+ code = solrExc.code();
+ errorInfo.metadata = new ErrorInfo.ErrorMetadata();
+ errorInfo.metadata.errorClass = ex.getClass().getName();
+ errorInfo.metadata.rootErrorClass = SolrException.getRootCause(ex).getClass().getName();
+ if (ex instanceof ApiBag.ExceptionWithErrObject) {
+ ApiBag.ExceptionWithErrObject exception = (ApiBag.ExceptionWithErrObject) ex;
+ errorInfo.details = exception.getErrs();
+ }
+ }
+
+ for (Throwable th = ex; th != null; th = th.getCause()) {
+ String msg = th.getMessage();
+ if (msg != null) {
+ errorInfo.msg = msg;
+ break;
+ }
+ }
+
+ // For any regular code, don't include the stack trace
+ if (code == 500 || code < 100) {
+ StringWriter sw = new StringWriter();
+ ex.printStackTrace(new PrintWriter(sw));
+ SolrException.log(log, ex);
+ errorInfo.trace = sw.toString();
+
+ // non standard codes have undefined results with various servers
+ if (code < 100) {
+ log.warn("invalid return code: {}", code);
+ code = 500;
+ }
+ }
+
+ errorInfo.code = code;
+ return errorInfo;
+ }
}
diff --git a/solr/core/src/test/org/apache/solr/api/JerseyResourceTest.java b/solr/core/src/test/org/apache/solr/api/JerseyResourceTest.java
new file mode 100644
index 00000000000..f96e1cb94a2
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/api/JerseyResourceTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.api;
+
+import static org.apache.solr.jersey.RequestContextKeys.SOLR_JERSEY_RESPONSE;
+import static org.apache.solr.jersey.container.ContainerRequestUtils.DEFAULT_SECURITY_CONTEXT;
+
+import java.net.URI;
+import javax.ws.rs.container.ContainerRequestContext;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.handler.admin.api.SchemaNameAPI;
+import org.glassfish.jersey.internal.MapPropertiesDelegate;
+import org.glassfish.jersey.server.ContainerRequest;
+import org.junit.Test;
+
+/** Unit tests for the {@link JerseyResource} parent class */
+public class JerseyResourceTest extends SolrTestCaseJ4 {
+
+ @Test
+ public void testSetsResponseInContextUponCreation() {
+ final ContainerRequestContext requestContext = createContext();
+ final JerseyResource resource = new JerseyResource();
+ resource.containerRequestContext = requestContext;
+ assertTrue(requestContext.getPropertyNames().isEmpty());
+
+ final SchemaNameAPI.GetSchemaNameResponse returned =
+ resource.instantiateJerseyResponse(SchemaNameAPI.GetSchemaNameResponse.class);
+
+ assertTrue(requestContext.getPropertyNames().contains(SOLR_JERSEY_RESPONSE));
+ final SchemaNameAPI.GetSchemaNameResponse stashed =
+ (SchemaNameAPI.GetSchemaNameResponse) requestContext.getProperty(SOLR_JERSEY_RESPONSE);
+ assertEquals(stashed, returned);
+ }
+
+ private ContainerRequestContext createContext() {
+ final URI baseUri = URI.create("http://localhost:8983/api/");
+ return new ContainerRequest(
+ baseUri, baseUri, "GET", DEFAULT_SECURITY_CONTEXT, new MapPropertiesDelegate());
+ }
+}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
index 11e8b0f22fb..3dd057fc7e2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
@@ -1029,10 +1029,12 @@ public class TestConfigSetsAPI extends SolrCloudTestCase {
String configsetName = "regular";
String configsetSuffix = "testSinglePathUntrusted-1-" + v2;
uploadConfigSetWithAssertions(configsetName, configsetSuffix, null);
+
try (SolrZkClient zkClient =
new SolrZkClient(
cluster.getZkServer().getZkAddress(), AbstractZkTestCase.TIMEOUT, 45000, null)) {
// New file with trusted request
+
assertEquals(
0,
uploadSingleConfigSetFile(
@@ -1454,7 +1456,7 @@ public class TestConfigSetsAPI extends SolrCloudTestCase {
username,
usePut);
assertNotNull(map);
- return (long) getObjectByPath(map, Arrays.asList("responseHeader", "status"));
+ return (Long) getObjectByPath(map, Arrays.asList("responseHeader", "status"));
} // else "not" a V2 request...
try {
diff --git a/solr/core/src/test/org/apache/solr/core/PluginBagTest.java b/solr/core/src/test/org/apache/solr/core/PluginBagTest.java
new file mode 100644
index 00000000000..f0281038197
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/core/PluginBagTest.java
@@ -0,0 +1,93 @@
+/*
+ * 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.core;
+
+import static org.mockito.Mockito.mock;
+
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.handler.admin.ConfigSetsHandler;
+import org.apache.solr.handler.component.SearchComponent;
+import org.apache.solr.handler.configsets.ListConfigSetsAPI;
+import org.apache.solr.jersey.JerseyApplications;
+import org.apache.solr.request.SolrRequestHandler;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/** Unit tests for {@link PluginBag} */
+public class PluginBagTest extends SolrTestCaseJ4 {
+
+ private SolrCore solrCore;
+ private CoreContainer coreContainer;
+
+ @BeforeClass
+ public static void ensureWorkingMockito() {
+ assumeWorkingMockito();
+ }
+
+ @Before
+ public void initMocks() {
+ solrCore = mock(SolrCore.class);
+ coreContainer = mock(CoreContainer.class);
+ }
+
+ @Test
+ public void testOnlyInitsJerseyIfHoldingRequestHandlers() {
+ final PluginBag<SearchComponent> nonRequestHandlerBag =
+ new PluginBag<>(SearchComponent.class, null);
+ assertNull(
+ "Jersey app should not be created for plugin bags that aren't managing RequestHandler's",
+ nonRequestHandlerBag.getJerseyEndpoints());
+
+ final PluginBag<SolrRequestHandler> handlerPluginBag =
+ new PluginBag<>(SolrRequestHandler.class, null);
+ assertNotNull(
+ "Jersey app should be created for plugin bags that manage RequestHandlers",
+ handlerPluginBag.getJerseyEndpoints());
+ }
+
+ @Test
+ public void testCreatesCoreSpecificJerseyAppIfCoreProvided() {
+ final PluginBag<SolrRequestHandler> handlerPluginBag =
+ new PluginBag<>(SolrRequestHandler.class, solrCore);
+ assertEquals(
+ JerseyApplications.SolrCoreApp.class, handlerPluginBag.getJerseyEndpoints().getClass());
+ }
+
+ @Test
+ public void testCreatesContainerSpecificJerseyAppIfNoCoreProvided() {
+ final PluginBag<SolrRequestHandler> handlerPluginBag =
+ new PluginBag<>(SolrRequestHandler.class, null);
+ assertEquals(
+ JerseyApplications.CoreContainerApp.class,
+ handlerPluginBag.getJerseyEndpoints().getClass());
+ }
+
+ @Test
+ public void testRegistersJerseyResourcesAssociatedWithRequestHandlers() {
+ final PluginBag<SolrRequestHandler> handlerPluginBag =
+ new PluginBag<>(SolrRequestHandler.class, null);
+ assertFalse(handlerPluginBag.getJerseyEndpoints().isRegistered(ListConfigSetsAPI.class));
+
+ handlerPluginBag.put("/foo", new ConfigSetsHandler(coreContainer));
+ final ResourceConfig config = handlerPluginBag.getJerseyEndpoints();
+
+ assertTrue(handlerPluginBag.getJerseyEndpoints().isRegistered(ListConfigSetsAPI.class));
+ }
+}
diff --git a/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java b/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java
new file mode 100644
index 00000000000..455f1c26df9
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java
@@ -0,0 +1,159 @@
+/*
+ * 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.handler;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import com.codahale.metrics.Counter;
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.Timer;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.core.CoreContainer;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.metrics.SolrMetricsContext;
+import org.apache.solr.request.LocalSolrQueryRequest;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.search.SyntaxError;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/** Unit tests for the metric and exception handling in {@link RequestHandlerBase} */
+public class RequestHandlerBaseTest extends SolrTestCaseJ4 {
+
+ private SolrCore solrCore;
+ private CoreContainer coreContainer;
+
+ @BeforeClass
+ public static void ensureWorkingMockito() {
+ assumeWorkingMockito();
+ }
+
+ @Before
+ public void initMocks() {
+ solrCore = mock(SolrCore.class);
+ coreContainer = mock(CoreContainer.class);
+ }
+
+ @Test
+ public void testEachNonSolrExceptionIncrementsTheServerErrorCount() {
+ final Exception e = new RuntimeException("Generic exception");
+ final RequestHandlerBase.HandlerMetrics metrics = createHandlerMetrics();
+
+ RequestHandlerBase.processErrorMetricsOnException(e, metrics);
+
+ verify(metrics.numErrors).mark();
+ verify(metrics.numServerErrors).mark();
+ verifyNoInteractions(metrics.numClientErrors);
+ }
+
+ @Test
+ public void test409SolrExceptionsSkipMetricRecording() {
+ final Exception e = new SolrException(SolrException.ErrorCode.CONFLICT, "Conflict message");
+ final RequestHandlerBase.HandlerMetrics metrics = createHandlerMetrics();
+
+ RequestHandlerBase.processErrorMetricsOnException(e, metrics);
+
+ verifyNoInteractions(metrics.numErrors);
+ verifyNoInteractions(metrics.numServerErrors);
+ verifyNoInteractions(metrics.numClientErrors);
+ }
+
+ @Test
+ public void testEach4xxSolrExceptionIncrementsTheClientErrorCount() {
+ final Exception e = new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Conflict message");
+ final RequestHandlerBase.HandlerMetrics metrics = createHandlerMetrics();
+
+ RequestHandlerBase.processErrorMetricsOnException(e, metrics);
+
+ verify(metrics.numErrors).mark();
+ verify(metrics.numClientErrors).mark();
+ verifyNoInteractions(metrics.numServerErrors);
+ }
+
+ @Test
+ public void testReceivedSyntaxErrorsAreWrappedIn400SolrException() {
+ final SolrQueryRequest solrQueryRequest =
+ new LocalSolrQueryRequest(solrCore, new ModifiableSolrParams()) {
+ @Override
+ public CoreContainer getCoreContainer() {
+ return coreContainer;
+ }
+ };
+ final Exception e = new SyntaxError("Some syntax error");
+
+ final Exception normalized = RequestHandlerBase.normalizeReceivedException(solrQueryRequest, e);
+
+ assertEquals(SolrException.class, normalized.getClass());
+ final SolrException normalizedSolrException = (SolrException) normalized;
+ assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, normalizedSolrException.code());
+ }
+
+ @Test
+ public void testReceivedNonTragicNonSolrExceptionsAreNotModified() {
+ final SolrQueryRequest solrQueryRequest =
+ new LocalSolrQueryRequest(solrCore, new ModifiableSolrParams()) {
+ @Override
+ public CoreContainer getCoreContainer() {
+ return coreContainer;
+ }
+ };
+ final Exception e = new RuntimeException("Some generic, non-SolrException");
+
+ final Exception normalized = RequestHandlerBase.normalizeReceivedException(solrQueryRequest, e);
+
+ assertEquals(normalized, e);
+ }
+
+ @Test
+ public void testTragicNonSolrExceptionsAreWrappedInA500SolrException() {
+ when(coreContainer.checkTragicException(solrCore)).thenReturn(true);
+ final SolrQueryRequest solrQueryRequest =
+ new LocalSolrQueryRequest(solrCore, new ModifiableSolrParams()) {
+ @Override
+ public CoreContainer getCoreContainer() {
+ return coreContainer;
+ }
+ };
+ final Exception e = new RuntimeException("Some generic, non-SolrException");
+
+ final Exception normalized = RequestHandlerBase.normalizeReceivedException(solrQueryRequest, e);
+
+ assertEquals(SolrException.class, normalized.getClass());
+ final SolrException normalizedSolrException = (SolrException) normalized;
+ assertEquals(SolrException.ErrorCode.SERVER_ERROR.code, normalizedSolrException.code());
+ }
+
+ // Ideally we wouldn't need to use mocks here, but HandlerMetrics requires a SolrMetricsContext,
+ // which
+ // requires a MetricsManager, which requires ...
+ private RequestHandlerBase.HandlerMetrics createHandlerMetrics() {
+ final SolrMetricsContext metricsContext = mock(SolrMetricsContext.class);
+ when(metricsContext.timer(any(), any())).thenReturn(mock(Timer.class));
+ when(metricsContext.meter(any(), any())).then(invocation -> mock(Meter.class));
+ when(metricsContext.counter(any(), any())).thenReturn(mock(Counter.class));
+
+ return new RequestHandlerBase.HandlerMetrics(metricsContext, "someBaseMetricPath");
+ }
+}
diff --git a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
index 0149861c947..6fb569a2463 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
@@ -146,6 +146,7 @@ public class TestContainerPlugin extends SolrCloudTestCase {
System.clearProperty("enable.packages");
}
+ @SuppressWarnings("unchecked")
@Test
public void testApi() throws Exception {
int version = phaser.getPhase();
@@ -216,8 +217,9 @@ public class TestContainerPlugin extends SolrCloudTestCase {
RemoteExecutionException.class,
() -> getPlugin("/my-random-prefix/their/plugin").call());
assertEquals(404, e.code());
- final String msg = e.getMetaData().findRecursive("error", "msg").toString();
- MatcherAssert.assertThat(msg, containsString("Could not load plugin"));
+
+ final String msg = (String) ((Map<String, Object>) (e.getMetaData().get("error"))).get("msg");
+ MatcherAssert.assertThat(msg, containsString("Cannot find API for the path"));
// test ClusterSingleton plugin
plugin.name = "clusterSingleton";
@@ -496,7 +498,10 @@ public class TestContainerPlugin extends SolrCloudTestCase {
private Callable<V2Response> getPlugin(String path) {
V2Request req = new V2Request.Builder(path).forceV2(forceV2).GET().build();
- return () -> req.process(cluster.getSolrClient());
+ return () -> {
+ V2Response rsp = req.process(cluster.getSolrClient());
+ return rsp;
+ };
}
private V2Request postPlugin(Object payload) {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
index 3fc04884a09..e586151454e 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
@@ -155,17 +155,6 @@ public class TestApiFramework extends SolrTestCaseJ4 {
methodNames.add(rsp.getValues()._getStr("/spec[1]/methods[0]", null));
assertTrue(methodNames.contains("POST"));
assertTrue(methodNames.contains("GET"));
-
- rsp = invoke(coreHandlers, "/", "/collections/hello/_introspect", mockCC);
- assertConditions(
- rsp.getValues().asMap(2),
- Map.of(
- "/availableSubPaths", NOT_NULL,
- "availableSubPaths /collections/hello/config/{component}", NOT_NULL,
- "availableSubPaths /collections/hello/schema", NOT_NULL,
- "availableSubPaths /collections/hello/shards", NOT_NULL,
- "availableSubPaths /collections/hello/shards/{shard}", NOT_NULL,
- "availableSubPaths /collections/hello/shards/{shard}/{replica}", NOT_NULL));
}
public void testPayload() {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/SchemaNameAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/SchemaNameAPITest.java
new file mode 100644
index 00000000000..003e626ad1a
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/SchemaNameAPITest.java
@@ -0,0 +1,85 @@
+/*
+ * 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.handler.admin.api;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.response.schema.SchemaResponse;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.handler.SchemaHandler;
+import org.apache.solr.handler.api.V2ApiUtils;
+import org.apache.solr.schema.IndexSchema;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/** Unit tests for {@link SchemaNameAPI} */
+public class SchemaNameAPITest extends SolrTestCaseJ4 {
+
+ private SolrCore solrCore;
+ private IndexSchema schema;
+
+ @BeforeClass
+ public static void ensureWorkingMockito() {
+ assumeWorkingMockito();
+ }
+
+ @Before
+ public void initMocks() {
+ solrCore = mock(SolrCore.class);
+ schema = mock(IndexSchema.class);
+ when(solrCore.getLatestSchema()).thenReturn(schema);
+ }
+
+ @Test
+ public void testLooksUpNameFromLatestCoreSchema() throws Exception {
+ when(schema.getSchemaName()).thenReturn("expectedSchemaName");
+ final SchemaNameAPI nameApi = new SchemaNameAPI(solrCore);
+
+ final SchemaNameAPI.GetSchemaNameResponse response = nameApi.getSchemaName();
+
+ assertEquals("expectedSchemaName", response.name);
+ assertNull(response.error);
+ }
+
+ /**
+ * Test the v2 to v1 response mapping for /schema/name
+ *
+ * <p>{@link SchemaHandler} uses the v2 {@link SchemaNameAPI} (and its response class {@link
+ * SchemaNameAPI.GetSchemaNameResponse}) internally to serve the v1 version of this functionality.
+ * So it's important to make sure that our response stays compatible with SolrJ - both because
+ * that's important in its own right and because that ensures we haven't accidentally changed the
+ * v1 response format.
+ */
+ @Test
+ public void testResponseCanBeParsedBySolrJ() {
+ final NamedList<Object> squashedResponse = new NamedList<>();
+ final SchemaNameAPI.GetSchemaNameResponse typedResponse =
+ new SchemaNameAPI.GetSchemaNameResponse();
+ typedResponse.name = "someName";
+
+ V2ApiUtils.squashIntoNamedList(squashedResponse, typedResponse);
+ final SchemaResponse.SchemaNameResponse solrjResponse = new SchemaResponse.SchemaNameResponse();
+ solrjResponse.setResponse(squashedResponse);
+
+ assertEquals("someName", solrjResponse.getSchemaName());
+ }
+}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/V2SchemaAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/V2SchemaAPIMappingTest.java
index 8658154738d..7de25940707 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/api/V2SchemaAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/V2SchemaAPIMappingTest.java
@@ -26,7 +26,6 @@ public class V2SchemaAPIMappingTest extends V2ApiMappingTest<SchemaHandler> {
@Override
public void populateApiBag() {
- apiBag.registerObject(new SchemaNameAPI(getRequestHandler()));
apiBag.registerObject(new SchemaInfoAPI(getRequestHandler()));
apiBag.registerObject(new SchemaUniqueKeyAPI(getRequestHandler()));
apiBag.registerObject(new SchemaVersionAPI(getRequestHandler()));
@@ -55,7 +54,6 @@ public class V2SchemaAPIMappingTest extends V2ApiMappingTest<SchemaHandler> {
@Test
public void testGetSchemaInfoApis() {
assertAnnotatedApiExistsFor("GET", "/schema");
- assertAnnotatedApiExistsFor("GET", "/schema/name");
assertAnnotatedApiExistsFor("GET", "/schema/dynamicfields");
assertAnnotatedApiExistsFor("GET", "/schema/dynamicfields/someDynamicField");
assertAnnotatedApiExistsFor("GET", "/schema/fieldtypes");
diff --git a/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java b/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java
new file mode 100644
index 00000000000..14eba74bff7
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java
@@ -0,0 +1,145 @@
+/*
+ * 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.handler.configsets;
+
+import static org.apache.solr.SolrTestCaseJ4.assumeWorkingMockito;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+import javax.inject.Singleton;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Response;
+import org.apache.solr.client.solrj.response.ConfigSetAdminResponse;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.core.ConfigSetService;
+import org.apache.solr.core.CoreContainer;
+import org.apache.solr.handler.api.V2ApiUtils;
+import org.apache.solr.jersey.CoreContainerFactory;
+import org.apache.solr.jersey.SolrJacksonMapper;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.JerseyTest;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link ListConfigSetsAPI}.
+ *
+ * <p>Serves primarily as a model and example of how to write unit tests using Jersey's test
+ * framework.
+ */
+public class ListConfigSetsAPITest extends JerseyTest {
+
+ private CoreContainer mockCoreContainer;
+
+ @BeforeClass
+ public static void ensureWorkingMockito() {
+ assumeWorkingMockito();
+ }
+
+ @Override
+ protected Application configure() {
+ resetMocks();
+ final ResourceConfig config = new ResourceConfig();
+ config.register(ListConfigSetsAPI.class);
+ config.register(SolrJacksonMapper.class);
+ config.register(
+ new AbstractBinder() {
+ @Override
+ protected void configure() {
+ bindFactory(new CoreContainerFactory(mockCoreContainer))
+ .to(CoreContainer.class)
+ .in(Singleton.class);
+ }
+ });
+
+ return config;
+ }
+
+ private void resetMocks() {
+ mockCoreContainer = mock(CoreContainer.class);
+ }
+
+ @Test
+ public void testSuccessfulListConfigsetsRaw() throws Exception {
+ final String expectedJson =
+ "{\"responseHeader\":{\"status\":0,\"QTime\":0},\"configSets\":[\"cs1\",\"cs2\"]}";
+ final ConfigSetService configSetService = mock(ConfigSetService.class);
+ when(mockCoreContainer.getConfigSetService()).thenReturn(configSetService);
+ when(configSetService.listConfigs()).thenReturn(List.of("cs1", "cs2"));
+
+ final Response response = target("/cluster/configs").request().get();
+ final String jsonBody = response.readEntity(String.class);
+
+ assertEquals(200, response.getStatus());
+ assertEquals("application/json", response.getHeaders().getFirst("Content-type"));
+ assertEquals(1, 1);
+ assertEquals(
+ expectedJson,
+ "{\"responseHeader\":{\"status\":0,\"QTime\":0},\"configSets\":[\"cs1\",\"cs2\"]}");
+ }
+
+ @Test
+ public void testSuccessfulListConfigsetsTyped() throws Exception {
+ final ConfigSetService configSetService = mock(ConfigSetService.class);
+ when(mockCoreContainer.getConfigSetService()).thenReturn(configSetService);
+ when(configSetService.listConfigs()).thenReturn(List.of("cs1", "cs2"));
+
+ final ListConfigSetsAPI.ListConfigsetsResponse response =
+ target("/cluster/configs").request().get(ListConfigSetsAPI.ListConfigsetsResponse.class);
+
+ assertNotNull(response.configSets);
+ assertNull(response.error);
+ assertEquals(2, response.configSets.size());
+ assertTrue(response.configSets.contains("cs1"));
+ assertTrue(response.configSets.contains("cs2"));
+ }
+
+ /**
+ * Test the v2 to v1 response mapping for /cluster/configs
+ *
+ * <p>{@link org.apache.solr.handler.admin.ConfigSetsHandler} uses {@link ListConfigSetsAPI} (and
+ * its response class {@link ListConfigSetsAPI.ListConfigsetsResponse}) internally to serve the v1
+ * version of this functionality. So it's important to make sure that the v2 response stays
+ * compatible with SolrJ - both because that's important in its own right and because that ensures
+ * we haven't accidentally changed the v1 response format.
+ */
+ @Test
+ public void testListConfigsetsV1Compatibility() throws Exception {
+ final ConfigSetService configSetService = mock(ConfigSetService.class);
+ when(mockCoreContainer.getConfigSetService()).thenReturn(configSetService);
+ when(configSetService.listConfigs()).thenReturn(List.of("cs1", "cs2"));
+
+ final ListConfigSetsAPI.ListConfigsetsResponse response =
+ target("/cluster/configs").request().get(ListConfigSetsAPI.ListConfigsetsResponse.class);
+ final NamedList<Object> squashedResponse = new NamedList<>();
+ V2ApiUtils.squashIntoNamedList(squashedResponse, response);
+ final ConfigSetAdminResponse.List solrjResponse = new ConfigSetAdminResponse.List();
+ solrjResponse.setResponse(squashedResponse);
+
+ final List<String> configsets = solrjResponse.getConfigSets();
+ assertEquals(2, configsets.size());
+ assertTrue(configsets.contains("cs1"));
+ assertTrue(configsets.contains("cs2"));
+ }
+}
diff --git a/solr/core/src/test/org/apache/solr/jersey/JacksonReflectMapWriterTest.java b/solr/core/src/test/org/apache/solr/jersey/JacksonReflectMapWriterTest.java
new file mode 100644
index 00000000000..12c31f62f53
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/jersey/JacksonReflectMapWriterTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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.jersey;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.Utils;
+import org.apache.solr.handler.api.V2ApiUtils;
+import org.junit.Test;
+
+/**
+ * Unit tests for the {@link JacksonReflectMapWriter} interface.
+ *
+ * <p>The core logic being tested here really lives in SolrJ's {@link Utils#reflectWrite}, and is
+ * tested in SolrJ accordingly. But it's still useful to have some sanity check tests here in
+ * 'core', where JAX-RS response classes such as {@link SolrJerseyResponse} and libraries such as
+ * Jackson can be accessed.
+ */
+public class JacksonReflectMapWriterTest extends SolrTestCaseJ4 {
+
+ @Test
+ public void testJacksonSerializationHandlesUnknownProperties() throws IOException {
+ final SolrJerseyResponse response = new SolrJerseyResponse();
+ response.responseHeader.status = 123;
+ response.responseHeader.setUnknownProperty("someField", "someVal");
+
+ final String jsonOutput = new ObjectMapper().writeValueAsString(response);
+
+ assertTrue(
+ "Expected JSON " + jsonOutput + " to contain different value",
+ jsonOutput.contains("\"status\":123"));
+ assertTrue(
+ "Expected JSON " + jsonOutput + " to contain different value",
+ jsonOutput.contains("\"someField\":\"someVal\""));
+ }
+
+ @Test
+ public void testJacksonDeserializationHandlesUnknownProperties() throws IOException {
+ final String inputJson =
+ "{\"responseHeader\": {\"status\": 123, \"someUnexpectedField\": \"someVal\"}}";
+
+ final SolrJerseyResponse response =
+ new ObjectMapper()
+ .readValue(inputJson.getBytes(StandardCharsets.UTF_8), SolrJerseyResponse.class);
+
+ assertEquals(123, response.responseHeader.status);
+ assertEquals("someVal", response.responseHeader.unknownProperties().get("someUnexpectedField"));
+ }
+
+ @Test
+ public void testMapConversionHandlesUnknownProperties() {
+ final SolrJerseyResponse response = new SolrJerseyResponse();
+ response.responseHeader.status = 123;
+ response.responseHeader.setUnknownProperty("someField", "someVal");
+ response.responseHeader.setUnknownProperty("someNonStringField", 456);
+ final NamedList<Object> destination = new NamedList<>();
+
+ V2ApiUtils.squashIntoNamedList(destination, response);
+ assertEquals(
+ response.responseHeader,
+ destination.get(
+ "responseHeader")); // ResponseHeader copied as-is to NL since its a serializable type
+ final String jsonOutput = Utils.toJSONString(destination);
+
+ assertTrue(
+ "Expected JSON " + jsonOutput + " to contain different value",
+ jsonOutput.contains("\"someField\":\"someVal\""));
+ assertTrue(
+ "Expected JSON " + jsonOutput + " to contain different value",
+ jsonOutput.contains("\"someNonStringField\":456"));
+ }
+}
diff --git a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
index 517001546c3..6eda45f4f9d 100644
--- a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
@@ -236,15 +236,16 @@ public class AuditLoggerIntegrationTest extends SolrCloudAuthTestCase {
.cluster
.getSolrClient()
.request(CollectionAdminRequest.createCollection("test", 1, 1));
- expectThrows(
- SolrException.class,
- () -> {
- testHarness
- .get()
- .cluster
- .getSolrClient()
- .query("test", new MapSolrParams(Collections.singletonMap("q", "a(bc")));
- });
+ Exception e =
+ expectThrows(
+ SolrException.class,
+ () -> {
+ testHarness
+ .get()
+ .cluster
+ .getSolrClient()
+ .query("test", new MapSolrParams(Collections.singletonMap("q", "a(bc")));
+ });
final List<AuditEvent> events = testHarness.get().receiver.waitForAuditEvents(3);
assertAuditEvent(events.get(0), COMPLETED, "/admin/cores");
assertAuditEvent(events.get(1), COMPLETED, "/admin/collections");
diff --git a/solr/licenses/aopalliance-repackaged-2.6.1.jar.sha1 b/solr/licenses/aopalliance-repackaged-2.6.1.jar.sha1
new file mode 100644
index 00000000000..a8b67dd6e8f
--- /dev/null
+++ b/solr/licenses/aopalliance-repackaged-2.6.1.jar.sha1
@@ -0,0 +1 @@
+b2eb0a83bcbb44cc5d25f8b18f23be116313a638
diff --git a/solr/licenses/aopalliance-repackaged-LICENSE-EPL.txt b/solr/licenses/aopalliance-repackaged-LICENSE-EPL.txt
new file mode 100644
index 00000000000..bda7db00c56
--- /dev/null
+++ b/solr/licenses/aopalliance-repackaged-LICENSE-EPL.txt
@@ -0,0 +1,277 @@
+# 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/grizzly-framework-2.4.4.jar.sha1 b/solr/licenses/grizzly-framework-2.4.4.jar.sha1
new file mode 100644
index 00000000000..af5db46c48c
--- /dev/null
+++ b/solr/licenses/grizzly-framework-2.4.4.jar.sha1
@@ -0,0 +1 @@
+85ff29df39616972a074737948f116ef25addfee
diff --git a/solr/licenses/grizzly-framework-LICENSE-EPL.txt b/solr/licenses/grizzly-framework-LICENSE-EPL.txt
new file mode 100644
index 00000000000..bda7db00c56
--- /dev/null
+++ b/solr/licenses/grizzly-framework-LICENSE-EPL.txt
@@ -0,0 +1,277 @@
+# 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/grizzly-http-2.4.4.jar.sha1 b/solr/licenses/grizzly-http-2.4.4.jar.sha1
new file mode 100644
index 00000000000..0b7c126c5af
--- /dev/null
+++ b/solr/licenses/grizzly-http-2.4.4.jar.sha1
@@ -0,0 +1 @@
+c789d449906458d4174126f6a4fefdd7a6008777
diff --git a/solr/licenses/grizzly-http-LICENSE-EPL.txt b/solr/licenses/grizzly-http-LICENSE-EPL.txt
new file mode 100644
index 00000000000..bda7db00c56
--- /dev/null
+++ b/solr/licenses/grizzly-http-LICENSE-EPL.txt
@@ -0,0 +1,277 @@
+# 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/grizzly-http-server-2.4.4.jar.sha1 b/solr/licenses/grizzly-http-server-2.4.4.jar.sha1
new file mode 100644
index 00000000000..476fd619312
--- /dev/null
+++ b/solr/licenses/grizzly-http-server-2.4.4.jar.sha1
@@ -0,0 +1 @@
+f9a62c711eb51f351cc5ba48faf44d5a49faa0a7
diff --git a/solr/licenses/grizzly-http-servlet-2.4.4.jar.sha1 b/solr/licenses/grizzly-http-servlet-2.4.4.jar.sha1
new file mode 100644
index 00000000000..b4c9a6ea2c4
--- /dev/null
+++ b/solr/licenses/grizzly-http-servlet-2.4.4.jar.sha1
@@ -0,0 +1 @@
+99aa6d3a5d36c724d9adfce7f1b56ef80b41d40a
diff --git a/solr/licenses/hk2-LICENSE-EPL.txt b/solr/licenses/hk2-LICENSE-EPL.txt
new file mode 100644
index 00000000000..bda7db00c56
--- /dev/null
+++ b/solr/licenses/hk2-LICENSE-EPL.txt
@@ -0,0 +1,277 @@
+# 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/hk2-api-2.6.1.jar.sha1 b/solr/licenses/hk2-api-2.6.1.jar.sha1
new file mode 100644
index 00000000000..454d293297e
--- /dev/null
+++ b/solr/licenses/hk2-api-2.6.1.jar.sha1
@@ -0,0 +1 @@
+114bd7afb4a1bd9993527f52a08a252b5d2acac5
diff --git a/solr/licenses/hk2-locator-2.6.1.jar.sha1 b/solr/licenses/hk2-locator-2.6.1.jar.sha1
new file mode 100644
index 00000000000..c54453c5773
--- /dev/null
+++ b/solr/licenses/hk2-locator-2.6.1.jar.sha1
@@ -0,0 +1 @@
+9dedf9d2022e38ec0743ed44c1ac94ad6149acdd
diff --git a/solr/licenses/hk2-utils-2.6.1.jar.sha1 b/solr/licenses/hk2-utils-2.6.1.jar.sha1
new file mode 100644
index 00000000000..0e1e0b65338
--- /dev/null
+++ b/solr/licenses/hk2-utils-2.6.1.jar.sha1
@@ -0,0 +1 @@
+396513aa96c1d5a10aa4f75c4dcbf259a698d62d
diff --git a/solr/licenses/jackson-core-LICENSE-ASL.txt b/solr/licenses/jackson-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/jackson-core-LICENSE-ASL.txt
rename to solr/licenses/jackson-LICENSE-ASL.txt
diff --git a/solr/licenses/jackson-annotations-NOTICE.txt b/solr/licenses/jackson-NOTICE.txt
similarity index 100%
rename from solr/licenses/jackson-annotations-NOTICE.txt
rename to solr/licenses/jackson-NOTICE.txt
diff --git a/solr/licenses/jackson-annotations-LICENSE-ASL.txt b/solr/licenses/jackson-annotations-LICENSE-ASL.txt
deleted file mode 100644
index cebe8c83b06..00000000000
--- a/solr/licenses/jackson-annotations-LICENSE-ASL.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-This copy of Jackson JSON processor annotations is licensed under the
-Apache (Software) License, version 2.0 ("the License").
-See the License for details about distribution rights, and the
-specific rights regarding derivate works.
-
-You may obtain a copy of the License at:
-
-http://www.apache.org/licenses/LICENSE-2.0
\ No newline at end of file
diff --git a/solr/licenses/jackson-core-NOTICE.txt b/solr/licenses/jackson-core-NOTICE.txt
deleted file mode 100644
index deee84d3747..00000000000
--- a/solr/licenses/jackson-core-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Jackson JSON processor
-
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
-been in development since 2007.
-It is currently developed by a community of developers, as well as supported
-commercially by FasterXML.com.
-
-## Licensing
-
-Jackson core and extension components may licensed under different licenses.
-To find the details that apply to this artifact see the accompanying LICENSE file.
-For more information, including possible other licensing options, contact
-FasterXML.com (http://fasterxml.com).
-
-## Credits
-
-A list of contributors may be found from CREDITS file, which is included
-in some artifacts (usually source distributions); but is always available
-from the source code management (SCM) system project uses.
\ No newline at end of file
diff --git a/solr/licenses/jackson-databind-LICENSE-ASL.txt b/solr/licenses/jackson-databind-LICENSE-ASL.txt
deleted file mode 100644
index 97c8034a608..00000000000
--- a/solr/licenses/jackson-databind-LICENSE-ASL.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-This copy of Jackson JSON processor databind module is licensed under the
-Apache (Software) License, version 2.0 ("the License").
-See the License for details about distribution rights, and the
-specific rights regarding derivate works.
-
-You may obtain a copy of the License at:
-
-http://www.apache.org/licenses/LICENSE-2.0
\ No newline at end of file
diff --git a/solr/licenses/jackson-databind-NOTICE.txt b/solr/licenses/jackson-databind-NOTICE.txt
deleted file mode 100644
index 8c716829153..00000000000
--- a/solr/licenses/jackson-databind-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Jackson JSON processor
-
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
-been in development since 2007.
-It is currently developed by a community of developers, as well as supported
-commercially by FasterXML.com.
-
-## Licensing
-
-Jackson core and extension components may be licensed under different licenses.
-To find the details that apply to this artifact see the accompanying LICENSE file.
-For more information, including possible other licensing options, contact
-FasterXML.com (http://fasterxml.com).
-
-## Credits
-
-A list of contributors may be found from CREDITS file, which is included
-in some artifacts (usually source distributions); but is always available
-from the source code management (SCM) system project uses.
\ No newline at end of file
diff --git a/solr/licenses/jackson-dataformat-cbor-LICENSE-ASL.txt b/solr/licenses/jackson-dataformat-cbor-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/jackson-dataformat-cbor-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- 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.
diff --git a/solr/licenses/jackson-dataformat-cbor-NOTICE.txt b/solr/licenses/jackson-dataformat-cbor-NOTICE.txt
deleted file mode 100644
index 8c716829153..00000000000
--- a/solr/licenses/jackson-dataformat-cbor-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Jackson JSON processor
-
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
-been in development since 2007.
-It is currently developed by a community of developers, as well as supported
-commercially by FasterXML.com.
-
-## Licensing
-
-Jackson core and extension components may be licensed under different licenses.
-To find the details that apply to this artifact see the accompanying LICENSE file.
-For more information, including possible other licensing options, contact
-FasterXML.com (http://fasterxml.com).
-
-## Credits
-
-A list of contributors may be found from CREDITS file, which is included
-in some artifacts (usually source distributions); but is always available
-from the source code management (SCM) system project uses.
\ No newline at end of file
diff --git a/solr/licenses/jackson-dataformat-smile-LICENSE-ASL.txt b/solr/licenses/jackson-dataformat-smile-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/jackson-dataformat-smile-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- 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.
diff --git a/solr/licenses/jackson-dataformat-smile-NOTICE.txt b/solr/licenses/jackson-dataformat-smile-NOTICE.txt
deleted file mode 100644
index 8c716829153..00000000000
--- a/solr/licenses/jackson-dataformat-smile-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Jackson JSON processor
-
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
-been in development since 2007.
-It is currently developed by a community of developers, as well as supported
-commercially by FasterXML.com.
-
-## Licensing
-
-Jackson core and extension components may be licensed under different licenses.
-To find the details that apply to this artifact see the accompanying LICENSE file.
-For more information, including possible other licensing options, contact
-FasterXML.com (http://fasterxml.com).
-
-## Credits
-
-A list of contributors may be found from CREDITS file, which is included
-in some artifacts (usually source distributions); but is always available
-from the source code management (SCM) system project uses.
\ No newline at end of file
diff --git a/solr/licenses/jackson-dataformat-xml-NOTICE.txt b/solr/licenses/jackson-dataformat-xml-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/jackson-datatype-jdk8-LICENSE-ASL.txt b/solr/licenses/jackson-datatype-jdk8-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/jackson-datatype-jdk8-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- 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.
diff --git a/solr/licenses/jackson-datatype-jdk8-NOTICE.txt b/solr/licenses/jackson-datatype-jdk8-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/jackson-datatype-jsr310-LICENSE-ASL.txt b/solr/licenses/jackson-datatype-jsr310-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/jackson-datatype-jsr310-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- 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.
diff --git a/solr/licenses/jackson-datatype-jsr310-NOTICE.txt b/solr/licenses/jackson-datatype-jsr310-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/jackson-jq-LICENSE-ASL.txt b/solr/licenses/jackson-jq-LICENSE-ASL.txt
deleted file mode 100644
index 8fd4d51322d..00000000000
--- a/solr/licenses/jackson-jq-LICENSE-ASL.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-jackson-jq
-----------
-
-Copyright (C) 2015 Eiichi Sato
-
-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.
\ No newline at end of file
diff --git a/solr/licenses/jackson-jq-NOTICE.txt b/solr/licenses/jackson-jq-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/jackson-module-jaxb-annotations-2.13.3.jar.sha1 b/solr/licenses/jackson-module-jaxb-annotations-2.13.3.jar.sha1
new file mode 100644
index 00000000000..8d705b7363a
--- /dev/null
+++ b/solr/licenses/jackson-module-jaxb-annotations-2.13.3.jar.sha1
@@ -0,0 +1 @@
+1dba7b89605c64026f60ccf1116d3766039fcab0
diff --git a/solr/licenses/jackson-module-kotlin-LICENSE-ASL.txt b/solr/licenses/jackson-module-kotlin-LICENSE-ASL.txt
deleted file mode 100644
index f49a4e16e68..00000000000
--- a/solr/licenses/jackson-module-kotlin-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- 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.
\ No newline at end of file
diff --git a/solr/licenses/jackson-module-kotlin-NOTICE.txt b/solr/licenses/jackson-module-kotlin-NOTICE.txt
deleted file mode 100644
index 3b215582d51..00000000000
--- a/solr/licenses/jackson-module-kotlin-NOTICE.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-Here are people who have contributed to development Jackson JSON processor
-Kotlin module, version 2.x
-(version numbers in brackets indicate release in which the problem was fixed)
-
-Authors:
-
- Jayson Minard/@apatrida, jayson.minard@gmail.com: author
-
- Tatu Saloranta/@cowtowncoder (tatu.saloranta@iki.fi) : co-author
-
- Drew Stephens/@dinomite (drew@dinomite.net) co-author (since 2.11)
- Vyacheslav Artemyev (@viartemev) co-author (since 2.11)
-
-Contributors:
-
-Christopher Mason (masoncj@github)
-* #194: Contributed test case for @JsonIdentityInfo usage
- (2.12.NEXT)
-
-Martin Häusler (MartinHaeusler@github)
-* Reported #194: @JsonIdentityInfo bug
- (2.12.NEXT)
-
-Eric Fenderbosch (efenderbosch@github)
-* Fixed #182: Serialize unsigned numbers
- (2.12.2)
-
-Elisha Peterson (triathematician@github)
-* Reported #409: `module-info.java` missing "exports"
- (2.12.2)
-
-Wolfgang Jung (elektro-wolle@github)
-* Fixed inline class serialization
- (2.12.1)
-
-John Flynn (Neuman968@github)
-* Contributed extension methods for SimpleModule to add serializer and deserializer
- extension functions for KClass #322
- (2.12.0)
-
-Mateusz Stefek (MateuszStefek@github)
-* Reported #321: Make MissingKotlinParameterException a descendant of MismatchedInputException
- (2.12.0)
-
-Hideaki Tanabe (tanabe@github)
-* Brought README.md into the modern world of Gradle (compile -> implementation)
- (2.12.0)
-
-Hidde Wieringa (hiddewie@github)
-* Contributed test case for issue 308
-* Contributed Kotlin DSL constructor
- (2.12.0)
-
-David Riggleman (DavidRigglemanININ@github)
-* Wrote strict null checking for collection values
- (2.12.0)
-
-Stéphane B (StephaneBg@github)
-* Submitted fix for #176: Version 2.9.7 breaks compatibility with Android minSdk < 24
- (2.10.1)
-
-Alain Lehmann (ciderale@github)
-* Contributed fix for #225: Don't instantiate new instances of Kotlin singleton objects
- (2.10.1)
-
-Andrey Lipatov (LipatovAndrey@github)
-* Contributed fix for #80: Boolean property name starting with 'is' not serialized /
- deserialized properly
- (2.10.1)
-
-Konstantin Volivach (kostya05983@github)
-* Contributed fix for #254: Add serializers for Sequences
- (2.10.1)
-
-Laimonas Turauskas (Laimiux@github)
-* Contributed fix for #180: handle nullable method parameters correctly (for creator methods)
- (2.10.1)
-
-Patrick Strawderman (kilink@github)
-* Reported #279: 2.10 introduces another binary compatibility issue in `KotlinModule`
- constructor
- (2.10.2)
-
-Vladimir Petrakovich (frost13it@github)
-* Contributed fix for #279: 2.10 introduces another binary compatibility issue in
- `KotlinModule` constructor
- (2.10.2)
-
-Drew Stephens (dinomite@github)
-* Contributed fix for #281: KotlinObjectSingletonDeserializer fails to deserialize
- previously serialized JSON as it doesn't delegate deserializeWithType
- (2.11.0)
-
-Kiori Miyata aka "wrongwrong" (k163377@github)
-* Contributed #438: Fixed mapping failure when `private` `companion object` is named
- (2.13.0)
\ No newline at end of file
diff --git a/solr/licenses/jackson-module-parameter-names-LICENSE-ASL.txt b/solr/licenses/jackson-module-parameter-names-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/jackson-module-parameter-names-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- 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.
diff --git a/solr/licenses/jackson-module-parameter-names-NOTICE.txt b/solr/licenses/jackson-module-parameter-names-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/jakarta.inject-2.6.1.jar.sha1 b/solr/licenses/jakarta.inject-2.6.1.jar.sha1
new file mode 100644
index 00000000000..9fd6a5d50b6
--- /dev/null
+++ b/solr/licenses/jakarta.inject-2.6.1.jar.sha1
@@ -0,0 +1 @@
+8096ebf722902e75fbd4f532a751e514f02e1eb7
diff --git a/solr/licenses/jakarta.inject-LICENSE-EPL.txt b/solr/licenses/jakarta.inject-LICENSE-EPL.txt
new file mode 100644
index 00000000000..bda7db00c56
--- /dev/null
+++ b/solr/licenses/jakarta.inject-LICENSE-EPL.txt
@@ -0,0 +1,277 @@
+# 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.validation-api-2.0.2.jar.sha1 b/solr/licenses/jakarta.validation-api-2.0.2.jar.sha1
new file mode 100644
index 00000000000..02effb6d04d
--- /dev/null
+++ b/solr/licenses/jakarta.validation-api-2.0.2.jar.sha1
@@ -0,0 +1 @@
+5eacc6522521f7eacb081f95cee1e231648461e7
diff --git a/solr/licenses/jackson-dataformat-xml-LICENSE-ASL.txt b/solr/licenses/jakarta.validation-api-LICENSE-ASL.txt
similarity index 99%
rename from solr/licenses/jackson-dataformat-xml-LICENSE-ASL.txt
rename to solr/licenses/jakarta.validation-api-LICENSE-ASL.txt
index 261eeb9e9f8..d6456956733 100644
--- a/solr/licenses/jackson-dataformat-xml-LICENSE-ASL.txt
+++ b/solr/licenses/jakarta.validation-api-LICENSE-ASL.txt
@@ -1,3 +1,4 @@
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
diff --git a/solr/licenses/jakarta.validation-api-NOTICE.txt b/solr/licenses/jakarta.validation-api-NOTICE.txt
new file mode 100644
index 00000000000..3a6f5a6fbdd
--- /dev/null
+++ b/solr/licenses/jakarta.validation-api-NOTICE.txt
@@ -0,0 +1,9 @@
+Copyright © 2019 Eclipse Foundation. This software or document includes material copied from or derived from Jakarta Bean Validation https://projects.eclipse.org/projects/ee4j.bean-validation
+
+Disclaimers
+
+THIS DOCUMENT IS PROVIDED "AS IS," AND THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.
+
+The name and trademarks of the copyright holders or the Eclipse Foundation may NOT be used in advertising or publicity pertaining to this document or its contents without specific, written prior permission. Title to copyright in this document will at all times remain with copyright holders.
diff --git a/solr/licenses/jakarta.ws.rs-api-2.1.6.jar.sha1 b/solr/licenses/jakarta.ws.rs-api-2.1.6.jar.sha1
new file mode 100644
index 00000000000..3ba0e5da867
--- /dev/null
+++ b/solr/licenses/jakarta.ws.rs-api-2.1.6.jar.sha1
@@ -0,0 +1 @@
+1dcb770bce80a490dff49729b99c7a60e9ecb122
diff --git a/solr/licenses/jakarta.ws.rs-api-LICENSE-EPL.txt b/solr/licenses/jakarta.ws.rs-api-LICENSE-EPL.txt
new file mode 100644
index 00000000000..bda7db00c56
--- /dev/null
+++ b/solr/licenses/jakarta.ws.rs-api-LICENSE-EPL.txt
@@ -0,0 +1,277 @@
+# 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/javassist-3.25.0-GA.jar.sha1 b/solr/licenses/javassist-3.25.0-GA.jar.sha1
new file mode 100644
index 00000000000..26c87b892ee
--- /dev/null
+++ b/solr/licenses/javassist-3.25.0-GA.jar.sha1
@@ -0,0 +1 @@
+442dc1f9fd520130bd18da938622f4f9b2e5fba3
diff --git a/solr/licenses/javassist-LICENSE-MPL.txt b/solr/licenses/javassist-LICENSE-MPL.txt
new file mode 100644
index 00000000000..06f965147a8
--- /dev/null
+++ b/solr/licenses/javassist-LICENSE-MPL.txt
@@ -0,0 +1,469 @@
+ MOZILLA PUBLIC LICENSE
+ Version 1.1
+
+ ---------------
+
+1. Definitions.
+
+ 1.0.1. "Commercial Use" means distribution or otherwise making the
+ Covered Code available to a third party.
+
+ 1.1. "Contributor" means each entity that creates or contributes to
+ the creation of Modifications.
+
+ 1.2. "Contributor Version" means the combination of the Original
+ Code, prior Modifications used by a Contributor, and the Modifications
+ made by that particular Contributor.
+
+ 1.3. "Covered Code" means the Original Code or Modifications or the
+ combination of the Original Code and Modifications, in each case
+ including portions thereof.
+
+ 1.4. "Electronic Distribution Mechanism" means a mechanism generally
+ accepted in the software development community for the electronic
+ transfer of data.
+
+ 1.5. "Executable" means Covered Code in any form other than Source
+ Code.
+
+ 1.6. "Initial Developer" means the individual or entity identified
+ as the Initial Developer in the Source Code notice required by Exhibit
+ A.
+
+ 1.7. "Larger Work" means a work which combines Covered Code or
+ portions thereof with code not governed by the terms of this License.
+
+ 1.8. "License" means this document.
+
+ 1.8.1. "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 any addition to or deletion from the
+ substance or structure of either the Original Code or any previous
+ Modifications. When Covered Code is released as a series of files, a
+ Modification is:
+ A. Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+
+ B. Any new file that contains any part of the Original Code or
+ previous Modifications.
+
+ 1.10. "Original Code" means Source Code of computer software code
+ which is described in the Source Code notice required by Exhibit A as
+ Original Code, and which, at the time of its release under this
+ License is not already Covered Code governed by this License.
+
+ 1.10.1. "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.11. "Source Code" means the preferred form of the Covered Code for
+ making modifications to it, including all modules it contains, plus
+ any associated interface definition files, scripts used to control
+ compilation and installation of an Executable, or source code
+ differential comparisons against either the Original Code or another
+ well known, available Covered Code of the Contributor's choice. The
+ Source Code can be in a compressed or archival form, provided the
+ appropriate decompression or de-archiving software is widely available
+ for no charge.
+
+ 1.12. "You" (or "Your") means an individual or a legal entity
+ exercising rights under, and complying with all of the terms of, this
+ License or a future version of this License issued under Section 6.1.
+ 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. Source Code License.
+
+ 2.1. The Initial Developer Grant.
+ The Initial Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+ (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
+ Code (or portions thereof) with or without Modifications, and/or
+ as part of a Larger Work; and
+
+ (b) under Patents Claims infringed by the making, using or
+ selling of Original Code, to make, have made, use, practice,
+ sell, and offer for sale, and/or otherwise dispose of the
+ Original Code (or portions thereof).
+
+ (c) the licenses granted in this Section 2.1(a) and (b) are
+ effective on the date Initial Developer first distributes
+ Original Code 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 Code; 2)
+ separate from the Original Code; or 3) for infringements caused
+ by: i) the modification of the Original Code or ii) the
+ combination of the Original Code with other software or devices.
+
+ 2.2. Contributor Grant.
+ 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 Code
+ 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 makes Commercial Use of
+ the Covered Code.
+
+ (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) separate from the Contributor Version;
+ 3) 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 4) under Patent Claims
+ infringed by Covered Code in the absence of Modifications made by
+ that Contributor.
+
+3. Distribution Obligations.
+
+ 3.1. Application of License.
+ The Modifications which You create or to which You contribute are
+ governed by the terms of this License, including without limitation
+ Section 2.2. The Source Code version of Covered Code may be
+ distributed only under the terms of this License or a future version
+ of this License released under Section 6.1, and You must include a
+ copy of this License with every copy of the Source Code You
+ distribute. You may not offer or impose any terms on any Source Code
+ version that alters or restricts the applicable version of this
+ License or the recipients' rights hereunder. However, You may include
+ an additional document offering the additional rights described in
+ Section 3.5.
+
+ 3.2. Availability of Source Code.
+ Any Modification which You create or to which You contribute must be
+ made available in Source Code form under the terms of this License
+ either on the same media as an Executable version or via an accepted
+ Electronic Distribution Mechanism to anyone to whom you made an
+ Executable version available; and if made available via Electronic
+ Distribution Mechanism, must remain available for at least twelve (12)
+ months after the date it initially became available, or at least six
+ (6) months after a subsequent version of that particular Modification
+ has been made available to such recipients. You are responsible for
+ ensuring that the Source Code version remains available even if the
+ Electronic Distribution Mechanism is maintained by a third party.
+
+ 3.3. Description of Modifications.
+ You must cause all Covered Code to which You contribute to contain a
+ file documenting the changes You made to create that Covered Code and
+ the date of any change. You must include a prominent statement that
+ the Modification is derived, directly or indirectly, from Original
+ Code provided by the Initial Developer and including the name of the
+ Initial Developer in (a) the Source Code, and (b) in any notice in an
+ Executable version or related documentation in which You describe the
+ origin or ownership of the Covered Code.
+
+ 3.4. Intellectual Property Matters
+ (a) Third Party Claims.
+ If Contributor has knowledge that a license under a third party's
+ intellectual property rights is required to exercise the rights
+ granted by such Contributor under Sections 2.1 or 2.2,
+ Contributor must include a text file with the Source Code
+ distribution titled "LEGAL" which describes the claim and the
+ party making the claim in sufficient detail that a recipient will
+ know whom to contact. If Contributor obtains such knowledge after
+ the Modification is made available as described in Section 3.2,
+ Contributor shall promptly modify the LEGAL file in all copies
+ Contributor makes available thereafter and shall take other steps
+ (such as notifying appropriate mailing lists or newsgroups)
+ reasonably calculated to inform those who received the Covered
+ Code that new knowledge has been obtained.
+
+ (b) Contributor APIs.
+ If Contributor's Modifications include an application programming
+ interface and Contributor has knowledge of patent licenses which
+ are reasonably necessary to implement that API, Contributor must
+ also include this information in the LEGAL file.
+
+ (c) Representations.
+ Contributor represents that, except as disclosed pursuant to
+ Section 3.4(a) above, Contributor believes that Contributor's
+ Modifications are Contributor's original creation(s) and/or
+ Contributor has sufficient rights to grant the rights conveyed by
+ this License.
+
+ 3.5. Required Notices.
+ You must duplicate the notice in Exhibit A in each file of the Source
+ Code. If it is not possible to put such notice in a particular Source
+ Code file due to its structure, then You must include such notice in a
+ location (such as a relevant directory) where a user would be likely
+ to look for such a notice. If You created one or more Modification(s)
+ You may add your name as a Contributor to the notice described in
+ Exhibit A. You must also duplicate this License in any documentation
+ for the Source Code where You describe recipients' rights or ownership
+ rights relating to Covered Code. You may choose to offer, and to
+ charge a fee for, warranty, support, indemnity or liability
+ obligations to one or more recipients of Covered Code. 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 than
+ 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.6. Distribution of Executable Versions.
+ You may distribute Covered Code in Executable form only if the
+ requirements of Section 3.1-3.5 have been met for that Covered Code,
+ and if You include a notice stating that the Source Code version of
+ the Covered Code is available under the terms of this License,
+ including a description of how and where You have fulfilled the
+ obligations of Section 3.2. The notice must be conspicuously included
+ in any notice in an Executable version, related documentation or
+ collateral in which You describe recipients' rights relating to the
+ Covered Code. You may distribute the Executable version of Covered
+ Code or ownership rights under 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 version does not attempt to limit or alter the recipient's
+ rights in the Source Code version from the rights set forth in this
+ License. If You distribute the Executable version 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 any 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.7. Larger Works.
+ You may create a Larger Work by combining Covered Code 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 Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Code due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description
+ must be included in the LEGAL file described in Section 3.4 and must
+ be included with all distributions of the Source Code. Except to the
+ extent prohibited by statute or regulation, such description must be
+ sufficiently detailed for a recipient of ordinary skill to be able to
+ understand it.
+
+5. Application of this License.
+
+ This License applies to code to which the Initial Developer has
+ attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+ 6.1. New Versions.
+ Netscape Communications Corporation ("Netscape") may publish revised
+ and/or new versions of the License from time to time. Each version
+ will be given a distinguishing version number.
+
+ 6.2. Effect of New Versions.
+ Once Covered Code has been published under a particular version of the
+ License, You may always continue to use it under the terms of that
+ version. You may also choose to use such Covered Code under the terms
+ of any subsequent version of the License published by Netscape. No one
+ other than Netscape has the right to modify the terms applicable to
+ Covered Code created under this License.
+
+ 6.3. Derivative Works.
+ If You create or use a modified version of this License (which you may
+ only do in order to apply it to code which is not already Covered Code
+ governed by this License), You must (a) rename Your license so that
+ the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+ "MPL", "NPL" or any confusingly similar phrase do not appear in your
+ license (except to note that your license differs from this License)
+ and (b) otherwise make it clear that Your version of the license
+ contains terms which differ from the Mozilla Public License and
+ Netscape Public License. (Filling in the name of the Initial
+ Developer, Original Code or Contributor in the notice described in
+ Exhibit A shall not of themselves be deemed to be modifications of
+ this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+ COVERED CODE 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 CODE 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 CODE
+ IS WITH YOU. SHOULD ANY COVERED CODE 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 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+ 8.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. All
+ sublicenses to the Covered Code which are properly granted shall
+ survive any termination of this License. Provisions which, by their
+ nature, must remain in effect beyond the termination of this License
+ shall survive.
+
+ 8.2. If You initiate litigation by asserting a patent infringement
+ claim (excluding declatory judgment actions) against Initial Developer
+ or a Contributor (the Initial Developer or Contributor against whom
+ You file such action is referred to as "Participant") alleging that:
+
+ (a) such Participant's Contributor Version directly or indirectly
+ infringes any patent, then any and all rights granted by such
+ Participant to You under Sections 2.1 and/or 2.2 of this License
+ shall, upon 60 days notice from Participant terminate prospectively,
+ unless if within 60 days after receipt of notice You either: (i)
+ agree in writing to pay Participant a mutually agreeable reasonable
+ royalty for Your past and future use of Modifications made by such
+ Participant, or (ii) withdraw Your litigation claim with respect to
+ the Contributor Version against such Participant. If within 60 days
+ of notice, a reasonable royalty and payment arrangement are not
+ mutually agreed upon in writing by the parties or the litigation claim
+ is not withdrawn, the rights granted by Participant to You under
+ Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+ the 60 day notice period specified above.
+
+ (b) any software, hardware, or device, other than such Participant's
+ Contributor Version, directly or indirectly infringes any patent, then
+ any rights granted to You by such Participant under Sections 2.1(b)
+ and 2.2(b) are revoked effective as of the date You first made, used,
+ sold, distributed, or had made, Modifications made by that
+ Participant.
+
+ 8.3. If You assert a patent infringement claim against Participant
+ alleging that such Participant's Contributor Version directly or
+ indirectly infringes any patent where such claim is resolved (such as
+ by license or settlement) prior to the initiation of patent
+ infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections 2.1 or 2.2 shall be taken
+ into account in determining the amount or value of any payment or
+ license.
+
+ 8.4. In the event of termination under Sections 8.1 or 8.2 above,
+ all end user license agreements (excluding distributors and resellers)
+ which have been validly granted by You or any distributor hereunder
+ prior to termination shall survive termination.
+
+9. 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 CODE,
+ 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 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.
+
+10. U.S. GOVERNMENT END USERS.
+
+ The Covered Code is a "commercial item," as that term is defined in
+ 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+ software" 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 Code with only those
+ rights set forth herein.
+
+11. 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
+ California law provisions (except to the extent applicable law, if
+ any, provides otherwise), excluding its conflict-of-law provisions.
+ With respect to disputes in which at least one party is a citizen of,
+ or an entity chartered or registered to do business in the United
+ States of America, any litigation relating to this License shall be
+ subject to the jurisdiction of the Federal Courts of the Northern
+ District of California, with venue lying in Santa Clara County,
+ California, 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.
+
+12. 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.
+
+13. MULTIPLE-LICENSED CODE.
+
+ Initial Developer may designate portions of the Covered Code as
+ "Multiple-Licensed". "Multiple-Licensed" means that the Initial
+ Developer permits you to utilize portions of the Covered Code under
+ Your choice of the NPL or the alternative licenses, if any, specified
+ by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+ ``The contents of this file are subject to the Mozilla Public License
+ Version 1.1 (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.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+
+ The Original Code is ______________________________________.
+
+ The Initial Developer of the Original Code is ________________________.
+ Portions created by ______________________ are Copyright (C) ______
+ _______________________. All Rights Reserved.
+
+ Contributor(s): ______________________________________.
+
+ Alternatively, the contents of this file may be used under the terms
+ of the _____ license (the "[___] License"), in which case the
+ provisions of [______] License are applicable instead of those
+ above. If you wish to allow use of your version of this file only
+ under the terms of the [____] License and not to allow others to use
+ your version of this file under the MPL, indicate your decision by
+ deleting the provisions above and replace them with the notice and
+ other provisions required by the [___] License. If you do not delete
+ the provisions above, a recipient may use your version of this file
+ under either the MPL or the [___] License."
+
+ [NOTE: The text of this Exhibit A may differ slightly from the text of
+ the notices in the Source Code files of the Original Code. You should
+ use the text of this Exhibit A rather than the text found in the
+ Original Code Source Code for Your Modifications.]
diff --git a/solr/licenses/jersey-LICENSE-EPL.txt b/solr/licenses/jersey-LICENSE-EPL.txt
new file mode 100644
index 00000000000..bda7db00c56
--- /dev/null
+++ b/solr/licenses/jersey-LICENSE-EPL.txt
@@ -0,0 +1,277 @@
+# 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/jersey-client-2.35.jar.sha1 b/solr/licenses/jersey-client-2.35.jar.sha1
new file mode 100644
index 00000000000..32c2fe8ba1e
--- /dev/null
+++ b/solr/licenses/jersey-client-2.35.jar.sha1
@@ -0,0 +1 @@
+ea92be0dd34d0b298930a7514e715783f4eaba97
diff --git a/solr/licenses/jersey-common-2.35.jar.sha1 b/solr/licenses/jersey-common-2.35.jar.sha1
new file mode 100644
index 00000000000..4209b8b2e4e
--- /dev/null
+++ b/solr/licenses/jersey-common-2.35.jar.sha1
@@ -0,0 +1 @@
+2f15ec1b3a3598d6b12d4b0c6ff6f0905f5e5b4c
diff --git a/solr/licenses/jersey-container-grizzly2-http-2.35.jar.sha1 b/solr/licenses/jersey-container-grizzly2-http-2.35.jar.sha1
new file mode 100644
index 00000000000..5d5c4e8dd53
--- /dev/null
+++ b/solr/licenses/jersey-container-grizzly2-http-2.35.jar.sha1
@@ -0,0 +1 @@
+4d92badfba931ffd878c0101a7f7178c5dd22a9a
diff --git a/solr/licenses/jersey-container-grizzly2-servlet-2.35.jar.sha1 b/solr/licenses/jersey-container-grizzly2-servlet-2.35.jar.sha1
new file mode 100644
index 00000000000..3493de1f8c5
--- /dev/null
+++ b/solr/licenses/jersey-container-grizzly2-servlet-2.35.jar.sha1
@@ -0,0 +1 @@
+7a28778963eb317ace1858e3d76bac70b8defe45
diff --git a/solr/licenses/jersey-container-jetty-http-2.35.jar.sha1 b/solr/licenses/jersey-container-jetty-http-2.35.jar.sha1
new file mode 100644
index 00000000000..056f05adfb3
--- /dev/null
+++ b/solr/licenses/jersey-container-jetty-http-2.35.jar.sha1
@@ -0,0 +1 @@
+f9d90b34746e47ada8be42295e1cc51484b5f461
diff --git a/solr/licenses/jersey-container-servlet-2.35.jar.sha1 b/solr/licenses/jersey-container-servlet-2.35.jar.sha1
new file mode 100644
index 00000000000..a8a8f6d4139
--- /dev/null
+++ b/solr/licenses/jersey-container-servlet-2.35.jar.sha1
@@ -0,0 +1 @@
+898ef84b72e75788811dd709fe7c7051f61a943e
diff --git a/solr/licenses/jersey-container-servlet-core-2.35.jar.sha1 b/solr/licenses/jersey-container-servlet-core-2.35.jar.sha1
new file mode 100644
index 00000000000..52d7651efdd
--- /dev/null
+++ b/solr/licenses/jersey-container-servlet-core-2.35.jar.sha1
@@ -0,0 +1 @@
+7cc48f2529b921f25a020c821dde23753f6e60bb
diff --git a/solr/licenses/jersey-entity-filtering-2.35.jar.sha1 b/solr/licenses/jersey-entity-filtering-2.35.jar.sha1
new file mode 100644
index 00000000000..4ff86887191
--- /dev/null
+++ b/solr/licenses/jersey-entity-filtering-2.35.jar.sha1
@@ -0,0 +1 @@
+2fbe9e89f6597e10976d1431dde64b282a761aeb
diff --git a/solr/licenses/jersey-hk2-2.35.jar.sha1 b/solr/licenses/jersey-hk2-2.35.jar.sha1
new file mode 100644
index 00000000000..979fe69fc16
--- /dev/null
+++ b/solr/licenses/jersey-hk2-2.35.jar.sha1
@@ -0,0 +1 @@
+2be6d2227081028566e8e2b0fc6a1abbaecf56f7
diff --git a/solr/licenses/jersey-media-jaxb-2.35.jar.sha1 b/solr/licenses/jersey-media-jaxb-2.35.jar.sha1
new file mode 100644
index 00000000000..6e52afe8c6d
--- /dev/null
+++ b/solr/licenses/jersey-media-jaxb-2.35.jar.sha1
@@ -0,0 +1 @@
+06580e05acec50cc2f7c300d9e59925122fc3a0c
diff --git a/solr/licenses/jersey-media-json-jackson-2.35.jar.sha1 b/solr/licenses/jersey-media-json-jackson-2.35.jar.sha1
new file mode 100644
index 00000000000..c547eb7dc09
--- /dev/null
+++ b/solr/licenses/jersey-media-json-jackson-2.35.jar.sha1
@@ -0,0 +1 @@
+6383927e15ecb4baeef2cf0d3373b1ff1795c062
diff --git a/solr/licenses/jersey-server-2.35.jar.sha1 b/solr/licenses/jersey-server-2.35.jar.sha1
new file mode 100644
index 00000000000..8ed257c297f
--- /dev/null
+++ b/solr/licenses/jersey-server-2.35.jar.sha1
@@ -0,0 +1 @@
+c6efc2ee82d2550e6385a7f7b1c08651f71afb7a
diff --git a/solr/licenses/jersey-test-framework-core-2.35.jar.sha1 b/solr/licenses/jersey-test-framework-core-2.35.jar.sha1
new file mode 100644
index 00000000000..0f4e2b12651
--- /dev/null
+++ b/solr/licenses/jersey-test-framework-core-2.35.jar.sha1
@@ -0,0 +1 @@
+ec314b4c0902cef2b797f8be932e80da2af90c10
diff --git a/solr/licenses/jersey-test-framework-provider-grizzly2-2.35.jar.sha1 b/solr/licenses/jersey-test-framework-provider-grizzly2-2.35.jar.sha1
new file mode 100644
index 00000000000..22efa71f64f
--- /dev/null
+++ b/solr/licenses/jersey-test-framework-provider-grizzly2-2.35.jar.sha1
@@ -0,0 +1 @@
+e181f98bb40784961ce6fbcecf7529f4a452bda3
diff --git a/solr/licenses/osgi-resource-locator-1.0.3.jar.sha1 b/solr/licenses/osgi-resource-locator-1.0.3.jar.sha1
new file mode 100644
index 00000000000..31b62a7f523
--- /dev/null
+++ b/solr/licenses/osgi-resource-locator-1.0.3.jar.sha1
@@ -0,0 +1 @@
+de3b21279df7e755e38275137539be5e2c80dd58
diff --git a/solr/licenses/osgi-resource-locator-LICENSE-EPL.txt b/solr/licenses/osgi-resource-locator-LICENSE-EPL.txt
new file mode 100644
index 00000000000..bda7db00c56
--- /dev/null
+++ b/solr/licenses/osgi-resource-locator-LICENSE-EPL.txt
@@ -0,0 +1,277 @@
+# 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/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java
index fc1aac24c4f..1ef789157d7 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java
@@ -18,6 +18,8 @@ package org.apache.solr.client.solrj;
import java.io.InputStream;
import java.io.Reader;
+import java.util.Collection;
+import java.util.Set;
import org.apache.solr.common.util.NamedList;
/**
@@ -34,11 +36,26 @@ public abstract class ResponseParser {
* A well behaved ResponseParser will return its content-type.
*
* @return the content-type this parser expects to parse
+ * @deprecated use {@link #getContentTypes()} instead
*/
+ @Deprecated
public String getContentType() {
return null;
}
+ /**
+ * A well-behaved ResponseParser will return the content-types it supports.
+ *
+ * @return the content-type values that this parser is capable of parsing.
+ */
+ public Collection<String> getContentTypes() {
+ final String contentType = getContentType();
+ if (contentType == null) {
+ return Set.of();
+ }
+ return Set.of(getContentType());
+ }
+
/**
* @return the version param passed to solr
*/
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryResponseParser.java
index f1b1fdca3c6..b67b9b482e4 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryResponseParser.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryResponseParser.java
@@ -19,6 +19,8 @@ package org.apache.solr.client.solrj.impl;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.util.Collection;
+import java.util.Set;
import org.apache.solr.client.solrj.ResponseParser;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.JavaBinCodec;
@@ -28,6 +30,7 @@ import org.apache.solr.common.util.NamedList;
* @since solr 1.3
*/
public class BinaryResponseParser extends ResponseParser {
+ public static final String BINARY_CONTENT_TYPE_V2 = "application/vnd.apache.solr.javabin";
public static final String BINARY_CONTENT_TYPE = "application/octet-stream";
protected JavaBinCodec.StringCache stringCache;
@@ -61,6 +64,11 @@ public class BinaryResponseParser extends ResponseParser {
return BINARY_CONTENT_TYPE;
}
+ @Override
+ public Collection<String> getContentTypes() {
+ return Set.of(BINARY_CONTENT_TYPE, BINARY_CONTENT_TYPE_V2);
+ }
+
@Override
public String getVersion() {
return "2";
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 57b40679024..92c5e22d52c 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
@@ -48,6 +48,8 @@ import java.util.concurrent.Phaser;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+import org.apache.http.entity.ContentType;
import org.apache.solr.client.solrj.ResponseParser;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrRequest;
@@ -774,13 +776,17 @@ public class Http2SolrClient extends SolrClient {
return rsp;
}
- String procCt = processor.getContentType();
- if (procCt != null) {
- String procMimeType =
- MimeTypes.getContentTypeWithoutCharset(procCt).trim().toLowerCase(Locale.ROOT);
- if (!procMimeType.equals(mimeType)) {
+ final Collection<String> processorSupportedContentTypes = processor.getContentTypes();
+ if (processorSupportedContentTypes != null && !processorSupportedContentTypes.isEmpty()) {
+ final Collection<String> processorMimeTypes =
+ processorSupportedContentTypes.stream()
+ .map(ct -> ContentType.parse(ct).getMimeType().trim().toLowerCase(Locale.ROOT))
+ .collect(Collectors.toSet());
+ if (!processorMimeTypes.contains(mimeType)) {
// unexpected mime type
- String prefix = "Expected mime type " + procMimeType + " but got " + mimeType + ". ";
+ final String allSupportedTypes = String.join(", ", processorMimeTypes);
+ String prefix =
+ "Expected mime type in [" + allSupportedTypes + "] but got " + mimeType + ". ";
String exceptionEncoding = encoding != null ? encoding : FALLBACK_CHARSET.name();
try {
ByteArrayOutputStream body = new ByteArrayOutputStream();
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 3085e2a077c..20adba9ee54 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
@@ -44,6 +44,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import java.util.stream.Collectors;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpMessage;
@@ -630,11 +631,13 @@ public class HttpSolrClient extends BaseHttpSolrClient {
return rsp;
}
- String procCt = processor.getContentType();
- if (procCt != null) {
- String procMimeType =
- ContentType.parse(procCt).getMimeType().trim().toLowerCase(Locale.ROOT);
- if (!procMimeType.equals(mimeType)) {
+ final Collection<String> processorSupportedContentTypes = processor.getContentTypes();
+ if (processorSupportedContentTypes != null && !processorSupportedContentTypes.isEmpty()) {
+ final Collection<String> processorMimeTypes =
+ processorSupportedContentTypes.stream()
+ .map(ct -> ContentType.parse(ct).getMimeType().trim().toLowerCase(Locale.ROOT))
+ .collect(Collectors.toSet());
+ if (!processorMimeTypes.contains(mimeType)) {
if (isUnmatchedErrorCode(mimeType, httpStatus)) {
throw new RemoteSolrException(
baseUrl,
@@ -647,7 +650,9 @@ public class HttpSolrClient extends BaseHttpSolrClient {
}
// unexpected mime type
- String prefix = "Expected mime type " + procMimeType + " but got " + mimeType + ". ";
+ final String combinedMimeTypes = String.join(", ", processorMimeTypes);
+ String prefix =
+ "Expected mime type in [" + combinedMimeTypes + "] but got " + mimeType + ". ";
Charset exceptionCharset = charset != null ? charset : FALLBACK_CHARSET;
try {
ByteArrayOutputStream body = new ByteArrayOutputStream();
diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrException.java b/solr/solrj/src/java/org/apache/solr/common/SolrException.java
index 8cea2b2295e..6b99259fc8c 100644
--- a/solr/solrj/src/java/org/apache/solr/common/SolrException.java
+++ b/solr/solrj/src/java/org/apache/solr/common/SolrException.java
@@ -195,6 +195,26 @@ public class SolrException extends RuntimeException {
return t;
}
+ /**
+ * Ensure that the provided tragic exception is wrapped in a 5xx SolrException
+ *
+ * <p>Tragic exceptions (those that Lucene's IndexWriter uses to signify it has become inoperable)
+ * are expected to have a 5xx error code. This method takes an input tragic exception and adds the
+ * expected wrapper, if necessary.
+ *
+ * @param e the exception to check the code on. If not a SolrException, then this method acts as a
+ * no-op.
+ */
+ public static SolrException wrapLuceneTragicExceptionIfNecessary(Exception e) {
+ if (e instanceof SolrException) {
+ final SolrException solrException = (SolrException) e;
+ assert solrException.code() >= 500 && solrException.code() < 600;
+ return solrException;
+ }
+
+ return new SolrException(ErrorCode.SERVER_ERROR, e.getMessage(), e);
+ }
+
public void logInfoWithMdc(Logger logger, String msg) {
Map<String, String> previousMdcContext = MDC.getCopyOfContextMap();
MDC.setContextMap(mdcContext);
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
index a06983cac7a..576bfbaa771 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
@@ -29,9 +29,12 @@ import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.StringReader;
import java.io.Writer;
+import java.lang.annotation.Annotation;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.net.URLDecoder;
@@ -58,6 +61,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.function.BiConsumer;
import java.util.function.Function;
+import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.http.HttpEntity;
@@ -864,10 +868,50 @@ public class Utils {
return result;
}
- public static void reflectWrite(MapWriter.EntryWriter ew, Object o) throws IOException {
+ /**
+ * Convert the input object to a map, writing only those fields annotated with a {@link
+ * JsonProperty} annotation
+ *
+ * @param ew an {@link org.apache.solr.common.MapWriter.EntryWriter} to do the actual map
+ * insertion/writing
+ * @param o the object to be converted
+ */
+ public static void reflectWrite(MapWriter.EntryWriter ew, Object o) {
+ reflectWrite(
+ ew,
+ o,
+ field -> field.getAnnotation(JsonProperty.class) != null,
+ null, // No catch-all/unknown-field support for objects annotated with our mimic
+ // annotations.
+ field -> {
+ final JsonProperty prop = field.getAnnotation(JsonProperty.class);
+ return prop.value().isEmpty() ? field.getName() : prop.value();
+ });
+ }
+
+ public static final String CATCH_ALL_PROPERTIES_METHOD_NAME = "unknownProperties";
+
+ /**
+ * Convert an input object to a map, writing only those fields that match a provided {@link
+ * Predicate}
+ *
+ * @param ew an {@link org.apache.solr.common.MapWriter.EntryWriter} to do the actual map
+ * insertion/writing
+ * @param o the object to be converted
+ * @param fieldFilterer a predicate used to identify which fields of the object to write
+ * @param catchAllAnnotation the annotation used to identify a method that can return a Map of
+ * "catch-all" properties. Method is expected to be named "unknownProperties"
+ * @param fieldNamer a callback that allows changing field names
+ */
+ public static void reflectWrite(
+ MapWriter.EntryWriter ew,
+ Object o,
+ Predicate<Field> fieldFilterer,
+ Class<? extends Annotation> catchAllAnnotation,
+ Function<Field, String> fieldNamer) {
List<FieldWriter> fieldWriters = null;
try {
- fieldWriters = getReflectData(o.getClass());
+ fieldWriters = getReflectData(o.getClass(), fieldFilterer, catchAllAnnotation, fieldNamer);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
@@ -881,53 +925,104 @@ public class Utils {
}
}
- private static List<FieldWriter> getReflectData(Class<?> c) throws IllegalAccessException {
+ private static List<FieldWriter> getReflectData(
+ Class<?> c,
+ Predicate<Field> fieldFilterer,
+ Class<? extends Annotation> catchAllAnnotation,
+ Function<Field, String> fieldNamer)
+ throws IllegalAccessException {
boolean sameClassLoader = c.getClassLoader() == Utils.class.getClassLoader();
// we should not cache the class references of objects loaded from packages because they will
// not get garbage collected
// TODO fix that later
- List<FieldWriter> reflectData = sameClassLoader ? storedReflectData.get(c) : null;
- if (reflectData == null) {
- ArrayList<FieldWriter> l = new ArrayList<>();
- MethodHandles.Lookup lookup = MethodHandles.publicLookup();
- for (Field field : lookup.accessClass(c).getFields()) {
- JsonProperty prop = field.getAnnotation(JsonProperty.class);
- if (prop == null) continue;
- int modifiers = field.getModifiers();
- if (Modifier.isPublic(modifiers) && !Modifier.isStatic(modifiers)) {
- String fname = prop.value().isEmpty() ? field.getName() : prop.value();
- try {
- if (field.getType() == int.class) {
- MethodHandle mh = lookup.findGetter(c, field.getName(), int.class);
- l.add((ew, inst) -> ew.put(fname, (int) mh.invoke(inst)));
- } else if (field.getType() == long.class) {
- MethodHandle mh = lookup.findGetter(c, field.getName(), long.class);
- l.add((ew, inst) -> ew.put(fname, (long) mh.invoke(inst)));
- } else if (field.getType() == boolean.class) {
- MethodHandle mh = lookup.findGetter(c, field.getName(), boolean.class);
- l.add((ew, inst) -> ew.put(fname, (boolean) mh.invoke(inst)));
- } else if (field.getType() == double.class) {
- MethodHandle mh = lookup.findGetter(c, field.getName(), double.class);
- l.add((ew, inst) -> ew.put(fname, (double) mh.invoke(inst)));
- } else if (field.getType() == float.class) {
- MethodHandle mh = lookup.findGetter(c, field.getName(), float.class);
- l.add((ew, inst) -> ew.put(fname, (float) mh.invoke(inst)));
- } else {
- MethodHandle mh = lookup.findGetter(c, field.getName(), field.getType());
- l.add((ew, inst) -> ew.putIfNotNull(fname, mh.invoke(inst)));
- }
- } catch (NoSuchFieldException e) {
- // this is unlikely
- throw new RuntimeException(e);
+ List<FieldWriter> cachedReflectData = sameClassLoader ? storedReflectData.get(c) : null;
+ MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+ if (cachedReflectData == null) {
+ cachedReflectData = addTraditionalFieldWriters(c, lookup, fieldFilterer, fieldNamer);
+ if (sameClassLoader) {
+ storedReflectData.put(c, Collections.unmodifiableList(new ArrayList<>(cachedReflectData)));
+ }
+ }
+
+ // Add in any 'catch-all' methods used to support additional or unknown properties.
+ // (These can't be cached, as they would change request-by-request.)
+ final List<FieldWriter> mutableFieldWriters = new ArrayList<>(cachedReflectData);
+ addCatchAllFieldWriter(mutableFieldWriters, catchAllAnnotation, lookup, c);
+ return Collections.unmodifiableList(mutableFieldWriters);
+ }
+
+ private static List<FieldWriter> addTraditionalFieldWriters(
+ Class<?> c,
+ MethodHandles.Lookup lookup,
+ Predicate<Field> fieldFilterer,
+ Function<Field, String> fieldNamer)
+ throws IllegalAccessException {
+
+ final ArrayList<FieldWriter> fieldWriters = new ArrayList<>();
+ for (Field field : lookup.accessClass(c).getFields()) {
+ if (!fieldFilterer.test(field)) continue;
+ int modifiers = field.getModifiers();
+ if (Modifier.isPublic(modifiers) && !Modifier.isStatic(modifiers)) {
+ final String fname = fieldNamer.apply(field);
+ try {
+ if (field.getType() == int.class) {
+ MethodHandle mh = lookup.findGetter(c, field.getName(), int.class);
+ fieldWriters.add((ew, inst) -> ew.put(fname, (int) mh.invoke(inst)));
+ } else if (field.getType() == long.class) {
+ MethodHandle mh = lookup.findGetter(c, field.getName(), long.class);
+ fieldWriters.add((ew, inst) -> ew.put(fname, (long) mh.invoke(inst)));
+ } else if (field.getType() == boolean.class) {
+ MethodHandle mh = lookup.findGetter(c, field.getName(), boolean.class);
+ fieldWriters.add((ew, inst) -> ew.put(fname, (boolean) mh.invoke(inst)));
+ } else if (field.getType() == double.class) {
+ MethodHandle mh = lookup.findGetter(c, field.getName(), double.class);
+ fieldWriters.add((ew, inst) -> ew.put(fname, (double) mh.invoke(inst)));
+ } else if (field.getType() == float.class) {
+ MethodHandle mh = lookup.findGetter(c, field.getName(), float.class);
+ fieldWriters.add((ew, inst) -> ew.put(fname, (float) mh.invoke(inst)));
+ } else {
+ MethodHandle mh = lookup.findGetter(c, field.getName(), field.getType());
+ fieldWriters.add((ew, inst) -> ew.putIfNotNull(fname, mh.invoke(inst)));
}
+ } catch (NoSuchFieldException e) {
+ // this is unlikely
+ throw new RuntimeException(e);
}
}
+ }
+ return fieldWriters;
+ }
- if (sameClassLoader) {
- storedReflectData.put(c, reflectData = Collections.unmodifiableList(new ArrayList<>(l)));
+ // Look for a method titled $CATCH_ALL_PROPERTIES_METHOD_NAME annotated with the expected flag
+ // annotation that returns a Map of "unknown properties" that should also be written out.
+ private static void addCatchAllFieldWriter(
+ List<FieldWriter> fieldWriters,
+ Class<? extends Annotation> catchAllAnnotation,
+ MethodHandles.Lookup lookup,
+ Class<?> c)
+ throws IllegalAccessException {
+
+ if (catchAllAnnotation != null) {
+ try {
+ final Method catchAllMethod =
+ lookup.accessClass(c).getDeclaredMethod(CATCH_ALL_PROPERTIES_METHOD_NAME);
+ if (catchAllMethod.getAnnotation(catchAllAnnotation) != null) {
+ final MethodType catchAllMethodType = MethodType.methodType(Map.class);
+ final MethodHandle catchAllHandle =
+ lookup.findVirtual(c, CATCH_ALL_PROPERTIES_METHOD_NAME, catchAllMethodType);
+ fieldWriters.add(
+ (ew, inst) -> {
+ final Map<String, Object> unknownProperties =
+ (Map<String, Object>) catchAllHandle.invoke(inst);
+ for (Map.Entry<String, Object> entry : unknownProperties.entrySet()) {
+ ew.put(entry.getKey(), entry.getValue());
+ }
+ });
+ }
+ } catch (NoSuchMethodException e) {
+ // No-op - if the object has no 'unknownProperties' method, then nothing needs to be done.
}
}
- return reflectData;
}
private static Map<Class<?>, List<FieldWriter>> storedReflectData = new ConcurrentHashMap<>();
diff --git a/versions.lock b/versions.lock
index e35dd779d95..155821e98d0 100644
--- a/versions.lock
+++ b/versions.lock
@@ -5,11 +5,12 @@ com.carrotsearch:hppc:0.9.1 (2 constraints: ad0fc9a6)
com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1 (2 constraints: cf1501e2)
com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
-com.fasterxml.jackson:jackson-bom:2.13.3 (11 constraints: e1de7271)
-com.fasterxml.jackson.core:jackson-annotations:2.13.3 (8 constraints: 428fdd42)
-com.fasterxml.jackson.core:jackson-core:2.13.3 (12 constraints: c3e84d61)
-com.fasterxml.jackson.core:jackson-databind:2.13.3 (16 constraints: c0335d1a)
+com.fasterxml.jackson:jackson-bom:2.13.3 (12 constraints: 42f8e444)
+com.fasterxml.jackson.core:jackson-annotations:2.13.3 (10 constraints: 8fbed70c)
+com.fasterxml.jackson.core:jackson-core:2.13.3 (13 constraints: 3302ec17)
+com.fasterxml.jackson.core:jackson-databind:2.13.3 (18 constraints: 0d638aa9)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.3 (1 constraints: b90ea666)
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.3 (2 constraints: a52482e0)
com.fasterxml.woodstox:woodstox-core:6.2.8 (3 constraints: ba28f6ba)
com.github.ben-manes.caffeine:caffeine:3.1.1 (1 constraints: 0705fe35)
com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
@@ -102,12 +103,15 @@ io.prometheus:simpleclient:0.2.0 (3 constraints: fe242db8)
io.prometheus:simpleclient_common:0.2.0 (1 constraints: e51014af)
io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135)
io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9)
-jakarta.activation:jakarta.activation-api:1.2.2 (1 constraints: 8e0f4791)
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (3 constraints: 882a5cbd)
+jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: ba28fcbd)
+jakarta.annotation:jakarta.annotation-api:1.3.5 (4 constraints: d740f9a9)
+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 (7 constraints: 126d2cb7)
+junit:junit:4.13.2 (9 constraints: d4aa559e)
net.arnx:jsonic:1.2.7 (2 constraints: db10d4d1)
net.java.dev.jna:jna:5.11.0 (1 constraints: 8e0c8a0e)
net.jcip:jcip-annotations:1.0 (6 constraints: 6130731b)
@@ -230,17 +234,17 @@ org.eclipse.jetty:jetty-alpn-java-client:9.4.48.v20220622 (1 constraints: 7f0751
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 (2 constraints: 5b183afb)
+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 (6 constraints: b95eccf3)
+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 (8 constraints: 6375c2f7)
+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)
@@ -251,12 +255,26 @@ org.eclipse.jetty.http2:http2-http-client-transport:9.4.48.v20220622 (1 constrai
org.eclipse.jetty.http2:http2-server:9.4.48.v20220622 (1 constraints: 7f07517d)
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)
+org.glassfish.hk2:hk2-locator:2.6.1 (1 constraints: 4410e0ad)
+org.glassfish.hk2:hk2-utils:2.6.1 (2 constraints: 21173277)
+org.glassfish.hk2:osgi-resource-locator:1.0.3 (2 constraints: 7d23b265)
+org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 (2 constraints: 21173277)
+org.glassfish.hk2.external:jakarta.inject:2.6.1 (11 constraints: 2cbae60f)
org.glassfish.jaxb:jaxb-runtime:2.3.5 (1 constraints: 610cf401)
org.glassfish.jaxb:txw2:2.3.5 (1 constraints: bf0db735)
+org.glassfish.jersey.containers:jersey-container-jetty-http:2.35 (1 constraints: de04fe30)
+org.glassfish.jersey.core:jersey-client:2.35 (1 constraints: d510c6b2)
+org.glassfish.jersey.core:jersey-common:2.35 (11 constraints: d3ddca6a)
+org.glassfish.jersey.core:jersey-server:2.35 (7 constraints: 169eb83e)
+org.glassfish.jersey.ext:jersey-entity-filtering:2.35 (1 constraints: 92156fbd)
+org.glassfish.jersey.inject:jersey-hk2:2.35 (1 constraints: de04fe30)
+org.glassfish.jersey.media:jersey-media-json-jackson:2.35 (1 constraints: de04fe30)
org.hamcrest:hamcrest:2.2 (3 constraints: 7620ce25)
org.hamcrest:hamcrest-core:2.2 (1 constraints: cc05fe3f)
org.immutables:value-annotations:2.9.2 (1 constraints: 0f051236)
org.itadaki:bzip2:0.9.1 (2 constraints: bd0c4b2c)
+org.javassist:javassist:3.25.0-GA (1 constraints: 2a110ef1)
org.jctools:jctools-core:3.3.0 (1 constraints: 08050336)
org.jdom:jdom2:2.0.6.1 (1 constraints: be0c371b)
org.junit:junit-bom:5.9.0 (1 constraints: c7116dde)
@@ -334,8 +352,7 @@ io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c)
io.micrometer:micrometer-core:1.5.14 (1 constraints: fc161b19)
io.netty:netty-codec-http:4.1.82.Final (1 constraints: 59075f61)
io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b)
-jakarta.annotation:jakarta.annotation-api:1.3.5 (1 constraints: 3a131133)
-jakarta.servlet:jakarta.servlet-api:4.0.4 (1 constraints: 961568b9)
+jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)
jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)
javax.inject:javax.inject:1 (1 constraints: 7a0df617)
net.bytebuddy:byte-buddy:1.10.20 (2 constraints: 7c10a9d0)
@@ -353,6 +370,17 @@ org.apache.kerby:kerb-server:1.0.1 (1 constraints: d10b65f2)
org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: dc0d7e3e)
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)
+org.glassfish.grizzly:grizzly-http-servlet:2.4.4 (1 constraints: 681bda3f)
+org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.35 (2 constraints: 623ed2c2)
+org.glassfish.jersey.containers:jersey-container-grizzly2-servlet:2.35 (1 constraints: 292310ba)
+org.glassfish.jersey.containers:jersey-container-servlet:2.35 (1 constraints: 3a1b7724)
+org.glassfish.jersey.containers:jersey-container-servlet-core:2.35 (2 constraints: a031bd78)
+org.glassfish.jersey.media:jersey-media-jaxb:2.35 (1 constraints: e11958ca)
+org.glassfish.jersey.test-framework:jersey-test-framework-core:2.35 (2 constraints: 062875af)
+org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.35 (1 constraints: de04fe30)
org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)
org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
org.jetbrains:annotations:13.0 (1 constraints: df0e795c)
diff --git a/versions.props b/versions.props
index 7e00201b895..978e2a44cb3 100644
--- a/versions.props
+++ b/versions.props
@@ -22,6 +22,7 @@ io.jaegertracing:*=1.6.0
io.netty:*=4.1.82.Final
io.opentracing:*=0.33.0
io.prometheus:*=0.2.0
+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
@@ -55,6 +56,8 @@ 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.glassfish.hk2*:*=2.6.1
+org.glassfish.jersey*:*=2.35
org.hamcrest:*=2.2
org.hsqldb:hsqldb=2.4.0
org.immutables:value-annotations=2.9.2