You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by so...@apache.org on 2020/06/03 19:13:46 UTC
[lucene-solr] 17/47: SOLR-14461: Replace commons-fileupload with
Jetty (#1490)
This is an automated email from the ASF dual-hosted git repository.
sokolov pushed a commit to branch jira/lucene-8962
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 57456a9079e4d8ba062653eb4c6b6709ea09d252
Author: David Smiley <ds...@apache.org>
AuthorDate: Fri May 22 00:34:48 2020 -0400
SOLR-14461: Replace commons-fileupload with Jetty (#1490)
---
lucene/ivy-versions.properties | 1 -
solr/CHANGES.txt | 3 +
solr/core/build.gradle | 1 -
solr/core/ivy.xml | 1 -
.../apache/solr/servlet/SolrDispatchFilter.java | 18 +-
.../apache/solr/servlet/SolrRequestParsers.java | 149 ++++++++-------
.../apache/solr/util/SolrFileCleaningTracker.java | 147 ---------------
solr/licenses/commons-fileupload-1.3.3.jar.sha1 | 1 -
solr/licenses/commons-fileupload-LICENSE-ASL.txt | 202 ---------------------
solr/licenses/commons-fileupload-NOTICE.txt | 5 -
versions.lock | 3 +-
versions.props | 1 -
12 files changed, 90 insertions(+), 442 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 0e0e65d..3fccbfb 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -55,7 +55,6 @@ com.sun.jersey.version = 1.19
/commons-cli/commons-cli = 1.4
/commons-codec/commons-codec = 1.13
/commons-collections/commons-collections = 3.2.2
-/commons-fileupload/commons-fileupload = 1.3.3
/commons-io/commons-io = 2.6
/commons-logging/commons-logging = 1.1.3
/de.l3s.boilerpipe/boilerpipe = 1.1.0
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 63193d7..2629407 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -233,6 +233,8 @@ Other Changes
* SOLR-14173: Major redesign of the Solr Reference Guide (Cassandra Targett)
+* SOLR-14461: Replaced commons-fileupload dependency with using Jetty's facilities. (David Smiley)
+
* SOLR-14466: Upgrade log4j2 to latest release (2.13.2) (Erick Erickson)
* SOLR-11934: Visit Solr logging, it's too noisy. Note particularly that the messages for
@@ -244,6 +246,7 @@ Other Changes
Erick Erickson)
* SOLR-14482: Fix or suppress warnings in solr/search/facet (Erick Erickson)
+
================== 8.5.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 6e9a068..71002c2 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -75,7 +75,6 @@ dependencies {
})
implementation 'com.tdunning:t-digest'
- implementation 'commons-fileupload:commons-fileupload'
implementation 'io.opentracing:opentracing-api'
implementation 'io.opentracing:opentracing-noop'
diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index 19d74f3..c632c47 100644
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@ -38,7 +38,6 @@
<dependency org="commons-codec" name="commons-codec" rev="${/commons-codec/commons-codec}" conf="compile"/>
<dependency org="commons-io" name="commons-io" rev="${/commons-io/commons-io}" conf="compile"/>
<dependency org="org.apache.commons" name="commons-exec" rev="${/org.apache.commons/commons-exec}" conf="compile"/>
- <dependency org="commons-fileupload" name="commons-fileupload" rev="${/commons-fileupload/commons-fileupload}" conf="compile"/>
<dependency org="commons-cli" name="commons-cli" rev="${/commons-cli/commons-cli}" conf="compile"/>
<dependency org="org.apache.commons" name="commons-text" rev="${/org.apache.commons/commons-text}" conf="compile"/>
<dependency org="com.google.guava" name="guava" rev="${/com.google.guava/guava}" conf="compile"/>
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index eb2f74a..ae183fe 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -58,7 +58,6 @@ import io.opentracing.Span;
import io.opentracing.SpanContext;
import io.opentracing.Tracer;
import io.opentracing.tag.Tags;
-import org.apache.commons.io.FileCleaningTracker;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpHeaders;
import org.apache.http.client.HttpClient;
@@ -83,7 +82,6 @@ import org.apache.solr.security.AuditEvent;
import org.apache.solr.security.AuthenticationPlugin;
import org.apache.solr.security.PKIAuthenticationPlugin;
import org.apache.solr.security.PublicKeyHandler;
-import org.apache.solr.util.SolrFileCleaningTracker;
import org.apache.solr.util.tracing.GlobalTracer;
import org.apache.solr.util.StartupLoggingUtils;
import org.apache.solr.util.configuration.SSLConfigurationsFactory;
@@ -152,8 +150,6 @@ public class SolrDispatchFilter extends BaseSolrFilter {
CoreContainer coresInit = null;
try{
- SolrRequestParsers.fileCleaningTracker = new SolrFileCleaningTracker();
-
StartupLoggingUtils.checkLogDir();
if (log.isInfoEnabled()) {
log.info("Using logger factory {}", StartupLoggingUtils.getLoggerImplStr());
@@ -324,19 +320,6 @@ public class SolrDispatchFilter extends BaseSolrFilter {
CoreContainer cc = cores;
cores = null;
try {
- try {
- FileCleaningTracker fileCleaningTracker = SolrRequestParsers.fileCleaningTracker;
- if (fileCleaningTracker != null) {
- fileCleaningTracker.exitWhenFinished();
- }
- } catch (NullPointerException e) {
- // okay
- } catch (Exception e) {
- log.warn("Exception closing FileCleaningTracker", e);
- } finally {
- SolrRequestParsers.fileCleaningTracker = null;
- }
-
if (metricManager != null) {
try {
metricManager.unregisterGauges(registryName, metricTag);
@@ -456,6 +439,7 @@ public class SolrDispatchFilter extends BaseSolrFilter {
GlobalTracer.get().clearContext();
consumeInputFully(request, response);
+ SolrRequestParsers.cleanupMultipartFiles(request);
}
}
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
index c8e886a..067e97c 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@ -16,11 +16,14 @@
*/
package org.apache.solr.servlet;
+import javax.servlet.MultipartConfigElement;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Part;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
@@ -38,10 +41,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.io.FileCleaningTracker;
import org.apache.commons.io.input.CloseShieldInputStream;
import org.apache.lucene.util.IOUtils;
import org.apache.solr.api.V2HttpCall;
@@ -60,14 +59,21 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.util.RTimerTree;
-import org.apache.solr.util.SolrFileCleaningTracker;
import org.apache.solr.util.tracing.GlobalTracer;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.MimeTypes;
+import org.eclipse.jetty.server.MultiParts;
+import org.eclipse.jetty.server.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.solr.common.params.CommonParams.PATH;
-public class SolrRequestParsers
-{
+public class SolrRequestParsers {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
// Should these constants be in a more public place?
public static final String MULTIPART = "multipart";
public static final String FORMDATA = "formdata";
@@ -92,9 +98,7 @@ public class SolrRequestParsers
/** Default instance for e.g. admin requests. Limits to 2 MB uploads and does not allow remote streams. */
public static final SolrRequestParsers DEFAULT = new SolrRequestParsers();
-
- public static volatile SolrFileCleaningTracker fileCleaningTracker;
-
+
/**
* Pass in an xml configuration. A null configuration will enable
* everything with maximum values.
@@ -534,29 +538,6 @@ public class SolrRequestParsers
}
}
-
- /**
- * Wrap a FileItem as a ContentStream
- */
- static class FileItemContentStream extends ContentStreamBase
- {
- private final FileItem item;
-
- public FileItemContentStream( FileItem f )
- {
- item = f;
- contentType = item.getContentType();
- name = item.getName();
- sourceInfo = item.getFieldName();
- size = item.getSize();
- }
-
- @Override
- public InputStream getStream() throws IOException {
- return item.getInputStream();
- }
- }
-
/**
* The raw parser just uses the params directly
*/
@@ -571,59 +552,99 @@ public class SolrRequestParsers
}
}
-
-
/**
* Extract Multipart streams
*/
static class MultipartRequestParser implements SolrRequestParser {
- private final int uploadLimitKB;
- private DiskFileItemFactory factory = new DiskFileItemFactory();
-
- public MultipartRequestParser(int limit) {
- uploadLimitKB = limit;
+ private final MultipartConfigElement multipartConfigElement;
- // Set factory constraints
- FileCleaningTracker fct = fileCleaningTracker;
- if (fct != null) {
- factory.setFileCleaningTracker(fileCleaningTracker);
- }
- // TODO - configure factory.setSizeThreshold(yourMaxMemorySize);
- // TODO - configure factory.setRepository(yourTempDirectory);
+ public MultipartRequestParser(int uploadLimitKB) {
+ multipartConfigElement = new MultipartConfigElement(
+ null, // temp dir (null=default)
+ -1, // maxFileSize (-1=none)
+ uploadLimitKB * 1024, // maxRequestSize
+ 100 * 1024 ); // fileSizeThreshold after which will go to disk
}
@Override
public SolrParams parseParamsAndFillStreams(
final HttpServletRequest req, ArrayList<ContentStream> streams) throws Exception {
- if( !ServletFileUpload.isMultipartContent(req) ) {
+ if (!isMultipart(req)) {
throw new SolrException( ErrorCode.BAD_REQUEST, "Not multipart content! "+req.getContentType() );
}
-
+ // Magic way to tell Jetty dynamically we want multi-part processing. "Request" here is a Jetty class
+ req.setAttribute(Request.MULTIPART_CONFIG_ELEMENT, multipartConfigElement);
+
MultiMapSolrParams params = parseQueryString( req.getQueryString() );
- // Create a new file upload handler
- ServletFileUpload upload = new ServletFileUpload(factory);
- upload.setSizeMax( ((long) uploadLimitKB) * 1024L );
+ // IMPORTANT: the Parts will all have the delete() method called by cleanupMultipartFiles()
- // Parse the request
- List<FileItem> items = upload.parseRequest(req);
- for (FileItem item : items) {
- // If it's a form field, put it in our parameter map
- if (item.isFormField()) {
+ for (Part part : req.getParts()) {
+ if (part.getSubmittedFileName() == null) { // thus a form field and not file upload
+ // If it's a form field, put it in our parameter map
+ String partAsString = org.apache.commons.io.IOUtils.toString(new PartContentStream(part).getReader());
MultiMapSolrParams.addParam(
- item.getFieldName().trim(),
- item.getString(), params.getMap() );
- }
- // Add the stream
- else {
- streams.add( new FileItemContentStream( item ) );
+ part.getName().trim(),
+ partAsString, params.getMap() );
+ } else { // file upload
+ streams.add(new PartContentStream(part));
}
}
return params;
}
+
+ boolean isMultipart(HttpServletRequest req) {
+ // Jetty utilities
+ return MimeTypes.Type.MULTIPART_FORM_DATA.is(HttpFields.valueParameters(req.getContentType(), null));
+ }
+
+ /** Wrap a MultiPart-{@link Part} as a {@link ContentStream} */
+ static class PartContentStream extends ContentStreamBase {
+ private final Part part;
+
+ public PartContentStream(Part part ) {
+ this.part = part;
+ contentType = part.getContentType();
+ name = part.getName();
+ sourceInfo = part.getSubmittedFileName();
+ size = part.getSize();
+ }
+
+ @Override
+ public InputStream getStream() throws IOException {
+ return part.getInputStream();
+ }
+ }
}
+ /** Clean up any tmp files created by MultiPartInputStream. */
+ static void cleanupMultipartFiles(HttpServletRequest request) {
+ // See Jetty MultiPartCleanerListener from which we drew inspiration
+ MultiParts multiParts = (MultiParts) request.getAttribute(Request.MULTIPARTS);
+ if (multiParts == null || multiParts.getContext() != request.getServletContext()) {
+ return;
+ }
+
+ log.debug("Deleting multipart files");
+
+ Collection<Part> parts;
+ try {
+ parts = multiParts.getParts();
+ } catch (IOException e) {
+ log.warn("Errors deleting multipart tmp files", e);
+ return;
+ }
+
+ for (Part part : parts) {
+ try {
+ part.delete();
+ } catch (IOException e) {
+ log.warn("Errors deleting multipart tmp files", e);
+ }
+ }
+ }
+
/**
* Extract application/x-www-form-urlencoded form data for POST requests
*/
@@ -791,7 +812,7 @@ public class SolrRequestParsers
return formdata.parseParamsAndFillStreams(req, streams, input);
}
- if (ServletFileUpload.isMultipartContent(req)) {
+ if (multipart.isMultipart(req)) {
return multipart.parseParamsAndFillStreams(req, streams);
}
diff --git a/solr/core/src/java/org/apache/solr/util/SolrFileCleaningTracker.java b/solr/core/src/java/org/apache/solr/util/SolrFileCleaningTracker.java
deleted file mode 100644
index 9c66f0f..0000000
--- a/solr/core/src/java/org/apache/solr/util/SolrFileCleaningTracker.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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.util;
-
-import java.io.File;
-import java.lang.ref.PhantomReference;
-import java.lang.ref.ReferenceQueue;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
-import org.apache.commons.io.FileCleaningTracker;
-import org.apache.commons.io.FileDeleteStrategy;
-
-public class SolrFileCleaningTracker extends FileCleaningTracker {
-
- ReferenceQueue<Object> q = new ReferenceQueue<>();
-
- final Collection<Tracker> trackers = Collections.synchronizedSet(new HashSet<Tracker>());
-
- final List<String> deleteFailures = Collections.synchronizedList(new ArrayList<String>());
-
- volatile boolean exitWhenFinished = false;
-
- Thread reaper;
-
- public void track(final File file, final Object marker) {
- track(file, marker, null);
- }
-
- public void track(final File file, final Object marker, final FileDeleteStrategy deleteStrategy) {
- if (file == null) {
- throw new NullPointerException("The file must not be null");
- }
- addTracker(file.getPath(), marker, deleteStrategy);
- }
-
- public void track(final String path, final Object marker) {
- track(path, marker, null);
- }
-
- public void track(final String path, final Object marker, final FileDeleteStrategy deleteStrategy) {
- if (path == null) {
- throw new NullPointerException("The path must not be null");
- }
- addTracker(path, marker, deleteStrategy);
- }
-
- private synchronized void addTracker(final String path, final Object marker,
- final FileDeleteStrategy deleteStrategy) {
- if (exitWhenFinished) {
- throw new IllegalStateException("No new trackers can be added once exitWhenFinished() is called");
- }
- if (reaper == null) {
- reaper = new Reaper();
- reaper.start();
- }
- trackers.add(new Tracker(path, deleteStrategy, marker, q));
- }
-
- public int getTrackCount() {
- return trackers.size();
- }
-
- public List<String> getDeleteFailures() {
- return deleteFailures;
- }
-
- public synchronized void exitWhenFinished() {
- // synchronized block protects reaper
- exitWhenFinished = true;
- if (reaper != null) {
- synchronized (reaper) {
- reaper.interrupt();
- try {
- reaper.join();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- }
- }
- }
-
- private final class Reaper extends Thread {
- Reaper() {
- super("MultiPart Upload Tmp File Reaper");
- setDaemon(true);
- }
-
- @Override
- public void run() {
- while (exitWhenFinished == false || trackers.size() > 0) {
- try {
- // Wait for a tracker to remove.
- final Tracker tracker = (Tracker) q.remove(); // cannot return null
- trackers.remove(tracker);
- if (!tracker.delete()) {
- deleteFailures.add(tracker.getPath());
- }
- tracker.clear();
- } catch (final InterruptedException e) {
- Thread.currentThread().interrupt();
- break;
- }
- }
- }
- }
-
- private static final class Tracker extends PhantomReference<Object> {
-
- private final String path;
-
- private final FileDeleteStrategy deleteStrategy;
-
- Tracker(final String path, final FileDeleteStrategy deleteStrategy, final Object marker,
- final ReferenceQueue<? super Object> queue) {
- super(marker, queue);
- this.path = path;
- this.deleteStrategy = deleteStrategy == null ? FileDeleteStrategy.NORMAL : deleteStrategy;
- }
-
- public String getPath() {
- return path;
- }
-
- public boolean delete() {
- return deleteStrategy.deleteQuietly(new File(path));
- }
- }
-
-}
\ No newline at end of file
diff --git a/solr/licenses/commons-fileupload-1.3.3.jar.sha1 b/solr/licenses/commons-fileupload-1.3.3.jar.sha1
deleted file mode 100644
index d27deb4..0000000
--- a/solr/licenses/commons-fileupload-1.3.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-04ff14d809195b711fd6bcc87e6777f886730ca1
diff --git a/solr/licenses/commons-fileupload-LICENSE-ASL.txt b/solr/licenses/commons-fileupload-LICENSE-ASL.txt
deleted file mode 100644
index d645695..0000000
--- a/solr/licenses/commons-fileupload-LICENSE-ASL.txt
+++ /dev/null
@@ -1,202 +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/commons-fileupload-NOTICE.txt b/solr/licenses/commons-fileupload-NOTICE.txt
deleted file mode 100644
index bec42c0..0000000
--- a/solr/licenses/commons-fileupload-NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons FileUpload
-Copyright 2002-2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/versions.lock b/versions.lock
index 31088b2..7b22ab6 100644
--- a/versions.lock
+++ b/versions.lock
@@ -49,8 +49,7 @@ com.vaadin.external.google:android-json:0.0.20131108.vaadin1 (1 constraints: 340
commons-cli:commons-cli:1.4 (1 constraints: a9041e2c)
commons-codec:commons-codec:1.13 (1 constraints: d904f430)
commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
-commons-fileupload:commons-fileupload:1.3.3 (1 constraints: 0905fc35)
-commons-io:commons-io:2.6 (2 constraints: bf145380)
+commons-io:commons-io:2.6 (1 constraints: ac04232c)
commons-logging:commons-logging:1.1.3 (2 constraints: c8149e7f)
de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 0405f335)
io.dropwizard.metrics:metrics-core:4.1.5 (5 constraints: 2543e4c0)
diff --git a/versions.props b/versions.props
index ea2a0a4..6a1c142 100644
--- a/versions.props
+++ b/versions.props
@@ -28,7 +28,6 @@ commons-beanutils:commons-beanutils=1.9.3
commons-cli:commons-cli=1.4
commons-codec:commons-codec=1.13
commons-collections:commons-collections=3.2.2
-commons-fileupload:commons-fileupload=1.3.3
commons-io:commons-io=2.6
commons-logging:commons-logging=1.1.3
de.l3s.boilerpipe:boilerpipe=1.1.0