You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/10/19 00:49:53 UTC
[1/8] lucene-solr:jira/http2: Java 9+ GC Logging filesize parameter
should be 20M instead of 20000
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 b9431da54 -> d40612271
Java 9+ GC Logging filesize parameter should be 20M instead of 20000
JEP 158 (https://openjdk.java.net/jeps/158) says the filesize parameter is the “file size in kb” however that appears to not be the case since when it is set to a value of 20000 you end up with GC logs that are only 20000 bytes in length. Setting the value to 20M produces the desired result of GC log files that are 20MB in size.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5202a713
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5202a713
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5202a713
Branch: refs/heads/jira/http2
Commit: 5202a713baad4c7b743ad5ccd5db2bc079672d84
Parents: 73a413c
Author: Tim Underwood <ti...@gmail.com>
Authored: Mon Oct 15 12:52:12 2018 -0700
Committer: Tim Underwood <ti...@gmail.com>
Committed: Mon Oct 15 12:52:40 2018 -0700
----------------------------------------------------------------------
solr/bin/solr | 2 +-
solr/bin/solr.cmd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5202a713/solr/bin/solr
----------------------------------------------------------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index 804ef2b..78840fd 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1911,7 +1911,7 @@ if [ "$GC_LOG_OPTS" != "" ]; then
# for simplicity, we only look at the prefix '-Xlog:gc'
# (if 'all' or multiple tags are used starting with anything other then 'gc' the user is on their own)
# if a single additional ':' exists in param, then there is already an explicit output specifier
- GC_LOG_OPTS[$i]=$(echo ${GC_LOG_OPTS[$i]} | sed "s|^\(-Xlog:gc[^:]*$\)|\1:file=$SOLR_LOGS_DIR/solr_gc.log:time,uptime:filecount=9,filesize=20000|")
+ GC_LOG_OPTS[$i]=$(echo ${GC_LOG_OPTS[$i]} | sed "s|^\(-Xlog:gc[^:]*$\)|\1:file=$SOLR_LOGS_DIR/solr_gc.log:time,uptime:filecount=9,filesize=20M|")
done
fi
fi
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5202a713/solr/bin/solr.cmd
----------------------------------------------------------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 005ea59..774e721 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1182,7 +1182,7 @@ if !JAVA_MAJOR_VERSION! GEQ 9 (
echo ERROR: On Java 9 you cannot set GC_LOG_OPTS, only default GC logging is available. Exiting
GOTO :eof
)
- set GC_LOG_OPTS="-Xlog:gc*:file=\"!SOLR_LOGS_DIR!\solr_gc.log\":time,uptime:filecount=9,filesize=20000"
+ set GC_LOG_OPTS="-Xlog:gc*:file=\"!SOLR_LOGS_DIR!\solr_gc.log\":time,uptime:filecount=9,filesize=20M"
) else (
IF "%GC_LOG_OPTS%"=="" (
rem Set defaults for Java 8
[6/8] lucene-solr:jira/http2: SOLR-12856: Small improvements to SolrJ
javadocs
Posted by da...@apache.org.
SOLR-12856: Small improvements to SolrJ javadocs
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e6f6f352
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e6f6f352
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e6f6f352
Branch: refs/heads/jira/http2
Commit: e6f6f352cfc30517235822b3deed83df1ee144c6
Parents: 4b2136e
Author: Jason Gerlowski <ge...@apache.org>
Authored: Wed Oct 17 15:58:48 2018 -0400
Committer: Jason Gerlowski <ge...@apache.org>
Committed: Wed Oct 17 19:10:56 2018 -0400
----------------------------------------------------------------------
.../apache/solr/client/solrj/SolrClient.java | 38 ++++++++++++++++++++
.../solr/client/solrj/impl/CloudSolrClient.java | 21 +++++++++--
.../solrj/impl/ConcurrentUpdateSolrClient.java | 10 +++++-
.../solr/client/solrj/impl/HttpSolrClient.java | 6 ++++
4 files changed, 71 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e6f6f352/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java
index 1c79efe..f435150 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java
@@ -141,6 +141,10 @@ public abstract class SolrClient implements Serializable, Closeable {
/**
* Adds a single document
*
+ * Many {@link SolrClient} implementations have drastically slower indexing performance when documents are added
+ * individually. Document batching generally leads to better indexing performance and should be used whenever
+ * possible.
+ *
* @param doc the input document
*
* @return an {@link org.apache.solr.client.solrj.response.UpdateResponse} from the server
@@ -229,6 +233,10 @@ public abstract class SolrClient implements Serializable, Closeable {
*
* The bean is converted to a {@link SolrInputDocument} by the client's
* {@link org.apache.solr.client.solrj.beans.DocumentObjectBinder}
+ * <p>
+ * Many {@link SolrClient} implementations have drastically slower indexing performance when documents are added
+ * individually. Document batching generally leads to better indexing performance and should be used whenever
+ * possible.
*
* @param collection to Solr collection to add documents to
* @param obj the input bean
@@ -435,6 +443,10 @@ public abstract class SolrClient implements Serializable, Closeable {
* Performs an explicit commit, causing pending documents to be committed for indexing
*
* waitFlush=true and waitSearcher=true to be inline with the defaults for plain HTTP access
+ * <p>
+ * Be very careful when triggering commits from the client side. Commits are heavy operations and WILL impact Solr
+ * performance when executed too often or too close together. Instead, consider using 'commitWithin' when adding documents
+ * or rely on your core's/collection's 'autoCommit' settings.
*
* @param collection the Solr collection to send the commit to
*
@@ -452,6 +464,10 @@ public abstract class SolrClient implements Serializable, Closeable {
* Performs an explicit commit, causing pending documents to be committed for indexing
*
* waitFlush=true and waitSearcher=true to be inline with the defaults for plain HTTP access
+ * <p>
+ * Be very careful when triggering commits from the client side. Commits are heavy operations and WILL impact Solr
+ * performance when executed too often or too close together. Instead, consider using 'commitWithin' when adding documents
+ * or rely on your core's/collection's 'autoCommit' settings.
*
* @return an {@link org.apache.solr.client.solrj.response.UpdateResponse} containing the response
* from the server
@@ -466,6 +482,10 @@ public abstract class SolrClient implements Serializable, Closeable {
/**
* Performs an explicit commit, causing pending documents to be committed for indexing
*
+ * Be very careful when triggering commits from the client side. Commits are heavy operations and WILL impact Solr
+ * performance when executed too often or too close together. Instead, consider using 'commitWithin' when adding documents
+ * or rely on your core's/collection's 'autoCommit' settings.
+ *
* @param collection the Solr collection to send the commit to
* @param waitFlush block until index changes are flushed to disk
* @param waitSearcher block until a new searcher is opened and registered as the
@@ -487,6 +507,10 @@ public abstract class SolrClient implements Serializable, Closeable {
/**
* Performs an explicit commit, causing pending documents to be committed for indexing
*
+ * Be very careful when triggering commits from the client side. Commits are heavy operations and WILL impact Solr
+ * performance when executed too often or too close together. Instead, consider using 'commitWithin' when adding documents
+ * or rely on your core's/collection's 'autoCommit' settings.
+ *
* @param waitFlush block until index changes are flushed to disk
* @param waitSearcher block until a new searcher is opened and registered as the
* main query searcher, making the changes visible
@@ -504,6 +528,10 @@ public abstract class SolrClient implements Serializable, Closeable {
/**
* Performs an explicit commit, causing pending documents to be committed for indexing
*
+ * Be very careful when triggering commits from the client side. Commits are heavy operations and WILL impact Solr
+ * performance when executed too often or too close together. Instead, consider using 'commitWithin' when adding documents
+ * or rely on your core's/collection's 'autoCommit' settings.
+ *
* @param collection the Solr collection to send the commit to
* @param waitFlush block until index changes are flushed to disk
* @param waitSearcher block until a new searcher is opened and registered as the
@@ -527,6 +555,10 @@ public abstract class SolrClient implements Serializable, Closeable {
/**
* Performs an explicit commit, causing pending documents to be committed for indexing
*
+ * Be very careful when triggering commits from the client side. Commits are heavy operations and WILL impact Solr
+ * performance when executed too often or too close together. Instead, consider using 'commitWithin' when adding documents
+ * or rely on your core's/collection's 'autoCommit' settings.
+ *
* @param waitFlush block until index changes are flushed to disk
* @param waitSearcher block until a new searcher is opened and registered as the
* main query searcher, making the changes visible
@@ -670,6 +702,9 @@ public abstract class SolrClient implements Serializable, Closeable {
* Note that this is not a true rollback as in databases. Content you have previously
* added may have been committed due to autoCommit, buffer full, other client performing
* a commit etc.
+ * <p>
+ * Also note that rollbacks reset changes made by <i>all</i> clients. Use this method carefully when multiple clients,
+ * or multithreaded clients are in use.
*
* @param collection the Solr collection to send the rollback to
*
@@ -689,6 +724,9 @@ public abstract class SolrClient implements Serializable, Closeable {
* Note that this is not a true rollback as in databases. Content you have previously
* added may have been committed due to autoCommit, buffer full, other client performing
* a commit etc.
+ * <p>
+ * Also note that rollbacks reset changes made by <i>all</i> clients. Use this method carefully when multiple clients,
+ * or multithreaded clients are in use.
*
* @return an {@link org.apache.solr.client.solrj.response.UpdateResponse} containing the response
* from the server
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e6f6f352/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
index 006d6bd..193555a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
@@ -1510,6 +1510,8 @@ public class CloudSolrClient extends SolrClient {
/**
* Tells {@link Builder} that created clients should send updates only to shard leaders.
+ *
+ * WARNING: This method currently has no effect. See SOLR-6312 for more information.
*/
public Builder sendUpdatesOnlyToShardLeaders() {
shardLeadersOnly = true;
@@ -1518,6 +1520,8 @@ public class CloudSolrClient extends SolrClient {
/**
* Tells {@link Builder} that created clients should send updates to all replicas for a shard.
+ *
+ * WARNING: This method currently has no effect. See SOLR-6312 for more information.
*/
public Builder sendUpdatesToAllReplicasInShard() {
shardLeadersOnly = false;
@@ -1526,6 +1530,8 @@ public class CloudSolrClient extends SolrClient {
/**
* Tells {@link Builder} that created clients should send direct updates to shard leaders only.
+ *
+ * UpdateRequests whose leaders cannot be found will "fail fast" on the client side with a {@link SolrException}
*/
public Builder sendDirectUpdatesToShardLeadersOnly() {
directUpdatesToLeadersOnly = true;
@@ -1533,15 +1539,24 @@ public class CloudSolrClient extends SolrClient {
}
/**
- * Tells {@link Builder} that created clients can send updates
- * to any shard replica (shard leaders and non-leaders).
+ * Tells {@link Builder} that created clients can send updates to any shard replica (shard leaders and non-leaders).
+ *
+ * Shard leaders are still preferred, but the created clients will fallback to using other replicas if a leader
+ * cannot be found.
*/
public Builder sendDirectUpdatesToAnyShardReplica() {
directUpdatesToLeadersOnly = false;
return this;
}
- /** Should direct updates to shards be done in parallel (the default) or if not then synchronously? */
+ /**
+ * Tells {@link Builder} whether created clients should send shard updates serially or in parallel
+ *
+ * When an {@link UpdateRequest} affects multiple shards, {@link CloudSolrClient} splits it up and sends a request
+ * to each affected shard. This setting chooses whether those sub-requests are sent serially or in parallel.
+ * <p>
+ * If not set, this defaults to 'true' and sends sub-requests in parallel.
+ */
public Builder withParallelUpdates(boolean parallelUpdates) {
this.parallelUpdates = parallelUpdates;
return this;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e6f6f352/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
index 26af757..e19d278 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
@@ -826,6 +826,9 @@ public class ConcurrentUpdateSolrClient extends SolrClient {
/**
* The maximum number of threads used to empty {@link ConcurrentUpdateSolrClient}s queue.
*
+ * Threads are created when documents are added to the client's internal queue and exit when no updates remain in
+ * the queue.
+ * <p>
* This value should be carefully paired with the maximum queue capacity. A client with too few threads may suffer
* decreased throughput as the queue fills up and {@link ConcurrentUpdateSolrClient#request(SolrRequest)} calls
* block waiting to add requests to the queue.
@@ -840,7 +843,7 @@ public class ConcurrentUpdateSolrClient extends SolrClient {
}
/**
- * Provides the {@link ExecutorService} for clients to use when servicing requests.
+ * Provides the {@link ExecutorService} for the created client to use when servicing the update-request queue.
*/
public Builder withExecutorService(ExecutorService executorService) {
this.executorService = executorService;
@@ -849,6 +852,8 @@ public class ConcurrentUpdateSolrClient extends SolrClient {
/**
* Configures created clients to always stream delete requests.
+ *
+ * Streamed deletes are put into the update-queue and executed like any other update request.
*/
public Builder alwaysStreamDeletes() {
this.streamDeletes = true;
@@ -857,6 +862,9 @@ public class ConcurrentUpdateSolrClient extends SolrClient {
/**
* Configures created clients to not stream delete requests.
+ *
+ * With this option set when the created ConcurrentUpdateSolrClient sents a delete request it will first will lock
+ * the queue and block until all queued updates have been sent, and then send the delete request.
*/
public Builder neverStreamDeletes() {
this.streamDeletes = false;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e6f6f352/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
----------------------------------------------------------------------
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 2b60e33..ad845e8 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
@@ -926,6 +926,12 @@ s * @deprecated since 7.0 Use {@link Builder} methods instead.
return this;
}
+ /**
+ * Adds to the set of params that the created {@link HttpSolrClient} will add on all requests
+ *
+ * @param params a set of parameters to add to the invariant-params list. These params must be unique and may not
+ * duplicate a param already in the invariant list.
+ */
public Builder withInvariantParams(ModifiableSolrParams params) {
Objects.requireNonNull(params, "params must be non null!");
[2/8] lucene-solr:jira/http2: SOLR-12740: fixed doc asciidoc errors
Posted by da...@apache.org.
SOLR-12740: fixed doc asciidoc errors
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/635d1ea5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/635d1ea5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/635d1ea5
Branch: refs/heads/jira/http2
Commit: 635d1ea53590d6ac25f93779b85d32bc3e5a1500
Parents: d2f7272
Author: Noble Paul <no...@apache.org>
Authored: Wed Oct 17 12:16:17 2018 +1100
Committer: Noble Paul <no...@apache.org>
Committed: Wed Oct 17 12:16:17 2018 +1100
----------------------------------------------------------------------
.../src/migrate-to-policy-rule.adoc | 22 +++++++++++++-------
.../src/solrcloud-autoscaling-api.adoc | 2 +-
2 files changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/635d1ea5/solr/solr-ref-guide/src/migrate-to-policy-rule.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/migrate-to-policy-rule.adoc b/solr/solr-ref-guide/src/migrate-to-policy-rule.adoc
index 6ad3c59..587147e 100644
--- a/solr/solr-ref-guide/src/migrate-to-policy-rule.adoc
+++ b/solr/solr-ref-guide/src/migrate-to-policy-rule.adoc
@@ -18,7 +18,8 @@
Replica placement rules (legacy) are deprecated in favor of the new policy and preferences syntax (new). This document helps you to migrate your existing replica placement rules to the new syntax.
-Every rule in the legacy framework can be expressed in the new syntax. Please refer to <<solrcloud-autoscaling-policy-preferences.adoc ,Autoscaling Policy & Preferences>> document for more details.
+
+Every rule in the legacy framework can be expressed in the new syntax. Please refer to <<solrcloud-autoscaling-policy-preferences.adoc#cluster-preferences-specification,Cluster Preferences Specification>> document for more details.
The following is the legacy syntax for a rule that limits maximum one replica for each shard in any Solr node
@@ -34,9 +35,9 @@ The equivalent new syntax is
{"replica":"<2","node":"#ANY","shard":"#EACH"}
----
-The new policy rules have to be created separately using an API call <<solrcloud-autoscaling-api.adoc#Create and Modify Cluster Policies, See examples>>
-
+The new policy rules have to be created separately using an API call <<solrcloud-autoscaling-api.adoc#cluster-specific-policies, See examples>>
+[[rule-operators1]]
== Rule Operators
All the following operators can be directly used in the new policy syntax and they mean the same.
@@ -46,6 +47,7 @@ All the following operators can be directly used in the new policy syntax and th
* *less than (<)*: `tag:<x` means tag value less than ‘x’. x must be a number
* *not equal (!)*: `tag:!x` means tag value MUST NOT be equal to ‘x’. The equals check is performed on String value
+[[fuzzy-operator1]]
=== Fuzzy Operator (~)
There is no `~` operator in the new syntax. Please use the attribute `"strict":false` instead
@@ -55,7 +57,7 @@ example:
{"replica":"<2","node":"#ANY","shard":"#EACH", "strict": false}
----
-
+[[tag-names1]]
== Tag names
Tag values are provided by the framework and these tags mean the same the new syntax as well
@@ -70,11 +72,12 @@ Tag values are provided by the framework and these tags mean the same the new sy
* *ip_1, ip_2, ip_3, ip_4*: These are ip fragments for each node. For example, in a host with ip `192.168.1.2`, `ip_1 = 2`, `ip_2 =1`, `ip_3 = 168` and` ip_4 = 192`
* *sysprop.\{PROPERTY_NAME}*: These are values available from system properties. `sysprop.key` means a value that is passed to the node as `-Dkey=keyValue` during the node startup. It is possible to use rules like `sysprop.key:expectedVal,shard:*`
+[[snitches1]]
== Snitches
There is no equivalent for a snitch in the new policy framework
== Porting existing Replica placement rules
-
+[[keep-less-than-2-replicas]]
=== Keep less than 2 replicas (at most 1 replica) of this collection on any node
For this rule, we define the `replica` condition with operators for "less than 2", and use a pre-defined tag named `node` to define nodes with any name.
@@ -92,6 +95,7 @@ replica:<2,node:*
----
{"replica":"<2","node":"#ANY"}
----
+[[keep-less-than-2-replicas--per-shard]]
=== For a given shard, keep less than 2 replicas on any node
For this rule, we use the `shard` condition to define any shard, the `replica` condition with operators for "less than 2", and finally a pre-defined tag named `node` to define nodes with any name.
@@ -109,6 +113,8 @@ shard:*,replica:<2,node:*
----
{"replica":"<2","shard":"#EACH", "node":"#ANY"}
----
+
+[[all-replicas-on-shard-730]]
=== Assign all replicas in shard1 to rack 730
This rule limits the `shard` condition to 'shard1', but any number of replicas. We're also referencing a custom tag named `rack`. Before defining this rule, we will need to configure a custom Snitch which provides values for the tag `rack`.
@@ -129,7 +135,7 @@ shard:shard1,replica:*,rack:730
Please note that all your nodes must be started with a system property `-Drack=<rack-number>`
-
+[[less-than-5-cores]]
=== Create replicas in nodes with less than 5 cores only
This rule uses the `replica` condition to define any number of replicas, but adds a pre-defined tag named `core` and uses operators for "less than 5".
@@ -147,7 +153,7 @@ cores:<5
----
{"cores":"<5", "node":"#ANY"}
----
-
+[[do-not-create-on-host]]
=== Do not create any replicas in host 192.45.67.3
*legacy:*
@@ -164,7 +170,7 @@ host:!192.45.67.3
{"replica": 0, "host":"192.45.67.3"}
----
-
+[[defining-rules1]]
== Defining Rules
Rules are always defined in along with the collection in the legacy system. The new syntax allows you to specify rules globally as well as on a <<solrcloud-autoscaling-policy-preferences.adoc#collection-specific-policy, per collection basis>>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/635d1ea5/solr/solr-ref-guide/src/solrcloud-autoscaling-api.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/solrcloud-autoscaling-api.adoc b/solr/solr-ref-guide/src/solrcloud-autoscaling-api.adoc
index c784ef4..edb6bd9 100644
--- a/solr/solr-ref-guide/src/solrcloud-autoscaling-api.adoc
+++ b/solr/solr-ref-guide/src/solrcloud-autoscaling-api.adoc
@@ -387,7 +387,7 @@ We can remove all cluster preferences by setting preferences to an empty list.
"set-cluster-preferences": []
}
----
-
+[[cluster-specific-policies]]
=== Create and Modify Cluster Policies
Cluster policies are set using the `set-cluster-policy` command.
[7/8] lucene-solr:jira/http2: Merge branch 'master' into jira/http2
Posted by da...@apache.org.
Merge branch 'master' into jira/http2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ca607579
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ca607579
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ca607579
Branch: refs/heads/jira/http2
Commit: ca607579e6ee84ccdf7ee79ef41f480a95adcdc3
Parents: b9431da e6f6f35
Author: Cao Manh Dat <da...@apache.org>
Authored: Thu Oct 18 08:45:20 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Thu Oct 18 08:45:20 2018 +0700
----------------------------------------------------------------------
lucene/highlighter/build.xml | 9 +-
.../highlight/LimitTokenOffsetFilter.java | 52 +++++
.../lucene/search/highlight/TokenSources.java | 1 -
lucene/ivy-versions.properties | 34 +--
lucene/licenses/commons-codec-1.10.jar.sha1 | 1 -
lucene/licenses/commons-codec-1.11.jar.sha1 | 1 +
solr/CHANGES.txt | 6 +-
solr/bin/solr | 2 +-
solr/bin/solr.cmd | 2 +-
solr/contrib/extraction/ivy.xml | 2 +
solr/licenses/apache-mime4j-core-0.8.1.jar.sha1 | 1 -
solr/licenses/apache-mime4j-core-0.8.2.jar.sha1 | 1 +
solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1 | 1 -
solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1 | 1 +
solr/licenses/bcmail-jdk15on-1.54.jar.sha1 | 1 -
solr/licenses/bcmail-jdk15on-1.60.jar.sha1 | 1 +
solr/licenses/bcpkix-jdk15on-1.54.jar.sha1 | 1 -
solr/licenses/bcpkix-jdk15on-1.60.jar.sha1 | 1 +
solr/licenses/bcprov-jdk15on-1.54.jar.sha1 | 1 -
solr/licenses/bcprov-jdk15on-1.60.jar.sha1 | 1 +
solr/licenses/commons-codec-1.10.jar.sha1 | 1 -
solr/licenses/commons-codec-1.11.jar.sha1 | 1 +
solr/licenses/commons-collections4-4.1.jar.sha1 | 1 -
solr/licenses/commons-collections4-4.2.jar.sha1 | 1 +
solr/licenses/dec-0.1.2.jar.sha1 | 1 +
solr/licenses/dec-LICENSE-MIT.txt | 19 ++
solr/licenses/dec-NOTICE.txt | 19 ++
solr/licenses/fontbox-2.0.12.jar.sha1 | 1 +
solr/licenses/fontbox-2.0.9.jar.sha1 | 1 -
solr/licenses/isoparser-1.1.18.jar.sha1 | 1 -
solr/licenses/isoparser-1.1.22.jar.sha1 | 1 +
solr/licenses/jackcess-2.1.10.jar.sha1 | 1 -
solr/licenses/jackcess-2.1.12.jar.sha1 | 1 +
.../licenses/jackson-annotations-2.9.5.jar.sha1 | 1 -
.../licenses/jackson-annotations-2.9.6.jar.sha1 | 1 +
solr/licenses/jackson-core-2.9.5.jar.sha1 | 1 -
solr/licenses/jackson-core-2.9.6.jar.sha1 | 1 +
solr/licenses/jackson-databind-2.9.5.jar.sha1 | 1 -
solr/licenses/jackson-databind-2.9.6.jar.sha1 | 1 +
.../jackson-dataformat-smile-2.9.5.jar.sha1 | 1 -
.../jackson-dataformat-smile-2.9.6.jar.sha1 | 1 +
solr/licenses/jempbox-1.8.13.jar.sha1 | 1 -
solr/licenses/jempbox-1.8.16.jar.sha1 | 1 +
solr/licenses/jmatio-1.2.jar.sha1 | 1 -
solr/licenses/jmatio-1.5.jar.sha1 | 1 +
solr/licenses/jsoup-1.11.2.jar.sha1 | 1 -
solr/licenses/jsoup-1.11.3.jar.sha1 | 1 +
.../licenses/metadata-extractor-2.10.1.jar.sha1 | 1 -
.../licenses/metadata-extractor-2.11.0.jar.sha1 | 1 +
solr/licenses/parso-2.0.9.jar.sha1 | 1 +
solr/licenses/parso-LICENSE-ASL.txt | 234 +++++++++++++++++++
solr/licenses/parso-NOTICE.txt | 234 +++++++++++++++++++
solr/licenses/pdfbox-2.0.12.jar.sha1 | 1 +
solr/licenses/pdfbox-2.0.9.jar.sha1 | 1 -
solr/licenses/pdfbox-tools-2.0.12.jar.sha1 | 1 +
solr/licenses/pdfbox-tools-2.0.9.jar.sha1 | 1 -
solr/licenses/poi-3.17.jar.sha1 | 1 -
solr/licenses/poi-4.0.0.jar.sha1 | 1 +
solr/licenses/poi-ooxml-3.17.jar.sha1 | 1 -
solr/licenses/poi-ooxml-4.0.0.jar.sha1 | 1 +
solr/licenses/poi-ooxml-schemas-3.17.jar.sha1 | 1 -
solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1 | 1 +
solr/licenses/poi-scratchpad-3.17.jar.sha1 | 1 -
solr/licenses/poi-scratchpad-4.0.0.jar.sha1 | 1 +
solr/licenses/tika-core-1.18.jar.sha1 | 1 -
solr/licenses/tika-core-1.19.1.jar.sha1 | 1 +
solr/licenses/tika-java7-1.18.jar.sha1 | 1 -
solr/licenses/tika-java7-1.19.1.jar.sha1 | 1 +
solr/licenses/tika-parsers-1.18.jar.sha1 | 1 -
solr/licenses/tika-parsers-1.19.1.jar.sha1 | 1 +
solr/licenses/tika-xmp-1.18.jar.sha1 | 1 -
solr/licenses/tika-xmp-1.19.1.jar.sha1 | 1 +
solr/licenses/xmlbeans-2.6.0.jar.sha1 | 1 -
solr/licenses/xmlbeans-3.0.1.jar.sha1 | 1 +
.../src/migrate-to-policy-rule.adoc | 22 +-
.../src/solrcloud-autoscaling-api.adoc | 2 +-
.../apache/solr/client/solrj/SolrClient.java | 38 +++
.../solr/client/solrj/impl/CloudSolrClient.java | 21 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 10 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 6 +
80 files changed, 712 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ca607579/lucene/ivy-versions.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ca607579/solr/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ca607579/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java
----------------------------------------------------------------------
[5/8] lucene-solr:jira/http2: SOLR-12874: Java 9+ GC Logging filesize
parameter should use a unit (merge branch 'java9plus_gc_logging_filesize' of
https://github.com/tpunder/lucene-solr); this closes #470
Posted by da...@apache.org.
SOLR-12874: Java 9+ GC Logging filesize parameter should use a unit
(merge branch 'java9plus_gc_logging_filesize' of https://github.com/tpunder/lucene-solr); this closes #470
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4b2136eb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4b2136eb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4b2136eb
Branch: refs/heads/jira/http2
Commit: 4b2136eb3c8890999aee6c063e66d577367fa333
Parents: fc88649 5202a71
Author: Uwe Schindler <us...@apache.org>
Authored: Wed Oct 17 23:24:51 2018 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Wed Oct 17 23:24:51 2018 +0200
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/bin/solr | 2 +-
solr/bin/solr.cmd | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4b2136eb/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index 637670a,3a58a68..746f349
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -193,6 -191,6 +193,8 @@@ Bug Fixe
* SOLR-12851: Improvements and fixes to let and select Streaming Expressions (Joel Bernstein)
++* SOLR-12874: Java 9+ GC Logging filesize parameter should use a unit. (Tim Underwood via Uwe Schindler)
++
Improvements
----------------------
[4/8] lucene-solr:jira/http2: SOLR-12423: Upgrade to Tika 1.19.1 when
available. Fixes #468
Posted by da...@apache.org.
SOLR-12423: Upgrade to Tika 1.19.1 when available. Fixes #468
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fc886497
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fc886497
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fc886497
Branch: refs/heads/jira/http2
Commit: fc886497de6edc967852a8ba7cb28f3af9b9fc64
Parents: 11a1b8c
Author: Erick Erickson <Er...@gmail.com>
Authored: Wed Oct 17 13:06:09 2018 -0400
Committer: Erick Erickson <Er...@gmail.com>
Committed: Wed Oct 17 13:06:09 2018 -0400
----------------------------------------------------------------------
lucene/ivy-versions.properties | 34 +--
lucene/licenses/commons-codec-1.10.jar.sha1 | 1 -
lucene/licenses/commons-codec-1.11.jar.sha1 | 1 +
solr/CHANGES.txt | 4 +-
solr/contrib/extraction/ivy.xml | 2 +
solr/licenses/apache-mime4j-core-0.8.1.jar.sha1 | 1 -
solr/licenses/apache-mime4j-core-0.8.2.jar.sha1 | 1 +
solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1 | 1 -
solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1 | 1 +
solr/licenses/bcmail-jdk15on-1.54.jar.sha1 | 1 -
solr/licenses/bcmail-jdk15on-1.60.jar.sha1 | 1 +
solr/licenses/bcpkix-jdk15on-1.54.jar.sha1 | 1 -
solr/licenses/bcpkix-jdk15on-1.60.jar.sha1 | 1 +
solr/licenses/bcprov-jdk15on-1.54.jar.sha1 | 1 -
solr/licenses/bcprov-jdk15on-1.60.jar.sha1 | 1 +
solr/licenses/commons-codec-1.10.jar.sha1 | 1 -
solr/licenses/commons-codec-1.11.jar.sha1 | 1 +
solr/licenses/commons-collections4-4.1.jar.sha1 | 1 -
solr/licenses/commons-collections4-4.2.jar.sha1 | 1 +
solr/licenses/dec-0.1.2.jar.sha1 | 1 +
solr/licenses/dec-LICENSE-MIT.txt | 19 ++
solr/licenses/dec-NOTICE.txt | 19 ++
solr/licenses/fontbox-2.0.12.jar.sha1 | 1 +
solr/licenses/fontbox-2.0.9.jar.sha1 | 1 -
solr/licenses/isoparser-1.1.18.jar.sha1 | 1 -
solr/licenses/isoparser-1.1.22.jar.sha1 | 1 +
solr/licenses/jackcess-2.1.10.jar.sha1 | 1 -
solr/licenses/jackcess-2.1.12.jar.sha1 | 1 +
.../licenses/jackson-annotations-2.9.5.jar.sha1 | 1 -
.../licenses/jackson-annotations-2.9.6.jar.sha1 | 1 +
solr/licenses/jackson-core-2.9.5.jar.sha1 | 1 -
solr/licenses/jackson-core-2.9.6.jar.sha1 | 1 +
solr/licenses/jackson-databind-2.9.5.jar.sha1 | 1 -
solr/licenses/jackson-databind-2.9.6.jar.sha1 | 1 +
.../jackson-dataformat-smile-2.9.5.jar.sha1 | 1 -
.../jackson-dataformat-smile-2.9.6.jar.sha1 | 1 +
solr/licenses/jempbox-1.8.13.jar.sha1 | 1 -
solr/licenses/jempbox-1.8.16.jar.sha1 | 1 +
solr/licenses/jmatio-1.2.jar.sha1 | 1 -
solr/licenses/jmatio-1.5.jar.sha1 | 1 +
solr/licenses/jsoup-1.11.2.jar.sha1 | 1 -
solr/licenses/jsoup-1.11.3.jar.sha1 | 1 +
.../licenses/metadata-extractor-2.10.1.jar.sha1 | 1 -
.../licenses/metadata-extractor-2.11.0.jar.sha1 | 1 +
solr/licenses/parso-2.0.9.jar.sha1 | 1 +
solr/licenses/parso-LICENSE-ASL.txt | 234 +++++++++++++++++++
solr/licenses/parso-NOTICE.txt | 234 +++++++++++++++++++
solr/licenses/pdfbox-2.0.12.jar.sha1 | 1 +
solr/licenses/pdfbox-2.0.9.jar.sha1 | 1 -
solr/licenses/pdfbox-tools-2.0.12.jar.sha1 | 1 +
solr/licenses/pdfbox-tools-2.0.9.jar.sha1 | 1 -
solr/licenses/poi-3.17.jar.sha1 | 1 -
solr/licenses/poi-4.0.0.jar.sha1 | 1 +
solr/licenses/poi-ooxml-3.17.jar.sha1 | 1 -
solr/licenses/poi-ooxml-4.0.0.jar.sha1 | 1 +
solr/licenses/poi-ooxml-schemas-3.17.jar.sha1 | 1 -
solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1 | 1 +
solr/licenses/poi-scratchpad-3.17.jar.sha1 | 1 -
solr/licenses/poi-scratchpad-4.0.0.jar.sha1 | 1 +
solr/licenses/tika-core-1.18.jar.sha1 | 1 -
solr/licenses/tika-core-1.19.1.jar.sha1 | 1 +
solr/licenses/tika-java7-1.18.jar.sha1 | 1 -
solr/licenses/tika-java7-1.19.1.jar.sha1 | 1 +
solr/licenses/tika-parsers-1.18.jar.sha1 | 1 -
solr/licenses/tika-parsers-1.19.1.jar.sha1 | 1 +
solr/licenses/tika-xmp-1.18.jar.sha1 | 1 -
solr/licenses/tika-xmp-1.19.1.jar.sha1 | 1 +
solr/licenses/xmlbeans-2.6.0.jar.sha1 | 1 -
solr/licenses/xmlbeans-3.0.1.jar.sha1 | 1 +
69 files changed, 562 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index f53544e..5a4f7de 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -12,9 +12,11 @@ com.carrotsearch.randomizedtesting.version = 2.6.4
/com.carrotsearch/hppc = 0.8.1
/com.cybozu.labs/langdetect = 1.1-20120112
-/com.drewnoakes/metadata-extractor = 2.10.1
+/com.drewnoakes/metadata-extractor = 2.11.0
-com.fasterxml.jackson.core.version = 2.9.5
+/com.epam/parso = 2.0.9
+
+com.fasterxml.jackson.core.version = 2.9.6
/com.fasterxml.jackson.core/jackson-annotations = ${com.fasterxml.jackson.core.version}
/com.fasterxml.jackson.core/jackson-core = ${com.fasterxml.jackson.core.version}
/com.fasterxml.jackson.core/jackson-databind = ${com.fasterxml.jackson.core.version}
@@ -27,8 +29,8 @@ com.fasterxml.jackson.core.version = 2.9.5
/com.google.protobuf/protobuf-java = 3.1.0
/com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
-/com.googlecode.mp4parser/isoparser = 1.1.18
-/com.healthmarketscience.jackcess/jackcess = 2.1.10
+/com.googlecode.mp4parser/isoparser = 1.1.22
+/com.healthmarketscience.jackcess/jackcess = 2.1.12
/com.healthmarketscience.jackcess/jackcess-encrypt = 2.1.4
/com.ibm.icu/icu4j = 62.1
/com.lmax/disruptor = 3.4.0
@@ -47,7 +49,7 @@ com.sun.jersey.version = 1.9
/com.tdunning/t-digest = 3.1
/com.vaadin.external.google/android-json = 0.0.20131108.vaadin1
/commons-cli/commons-cli = 1.2
-/commons-codec/commons-codec = 1.10
+/commons-codec/commons-codec = 1.11
/commons-collections/commons-collections = 3.2.2
/commons-configuration/commons-configuration = 1.6
/commons-fileupload/commons-fileupload = 1.3.3
@@ -106,7 +108,7 @@ org.apache.calcite.version = 1.13.0
/org.apache.calcite/calcite-core = ${org.apache.calcite.version}
/org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
-/org.apache.commons/commons-collections4 = 4.1
+/org.apache.commons/commons-collections4 = 4.2
/org.apache.commons/commons-compress = 1.18
/org.apache.commons/commons-exec = 1.3
/org.apache.commons/commons-lang3 = 3.6
@@ -169,7 +171,7 @@ org.apache.hadoop.version = 2.7.4
/org.apache.ivy/ivy = 2.4.0
-org.apache.james.apache.mime4j.version = 0.8.1
+org.apache.james.apache.mime4j.version = 0.8.2
/org.apache.james/apache-mime4j-core = ${org.apache.james.apache.mime4j.version}
/org.apache.james/apache-mime4j-dom = ${org.apache.james.apache.mime4j.version}
@@ -183,19 +185,19 @@ org.apache.logging.log4j.version = 2.11.0
/org.apache.opennlp/opennlp-tools = 1.9.0
-org.apache.pdfbox.version = 2.0.9
+org.apache.pdfbox.version = 2.0.12
/org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
-/org.apache.pdfbox/jempbox = 1.8.13
+/org.apache.pdfbox/jempbox = 1.8.16
/org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
/org.apache.pdfbox/pdfbox-tools = ${org.apache.pdfbox.version}
-org.apache.poi.version = 3.17
+org.apache.poi.version = 4.0.0
/org.apache.poi/poi = ${org.apache.poi.version}
/org.apache.poi/poi-ooxml = ${org.apache.poi.version}
/org.apache.poi/poi-ooxml-schemas = ${org.apache.poi.version}
/org.apache.poi/poi-scratchpad = ${org.apache.poi.version}
-org.apache.tika.version = 1.18
+org.apache.tika.version = 1.19.1
/org.apache.tika/tika-core = ${org.apache.tika.version}
/org.apache.tika/tika-java7 = ${org.apache.tika.version}
/org.apache.tika/tika-parsers = ${org.apache.tika.version}
@@ -203,7 +205,7 @@ org.apache.tika.version = 1.18
/org.apache.velocity/velocity = 1.7
/org.apache.velocity/velocity-tools = 2.0
-/org.apache.xmlbeans/xmlbeans = 2.6.0
+/org.apache.xmlbeans/xmlbeans = 3.0.1
/org.apache.zookeeper/zookeeper = 3.4.11
# v1.6.0-alpha.5 of asciidoctor-ant includes asciidoctorj-pdf 1.5.0-alpha.16,
@@ -212,11 +214,13 @@ org.apache.tika.version = 1.18
/org.aspectj/aspectjrt = 1.8.0
-org.bouncycastle.version = 1.54
+org.bouncycastle.version = 1.60
/org.bouncycastle/bcmail-jdk15on = ${org.bouncycastle.version}
/org.bouncycastle/bcpkix-jdk15on = ${org.bouncycastle.version}
/org.bouncycastle/bcprov-jdk15on = ${org.bouncycastle.version}
+/org.brotli/dec = 0.1.2
+
/org.carrot2.attributes/attributes-binder = 1.3.3
/org.carrot2.shaded/carrot2-guava = 18.0
@@ -263,7 +267,7 @@ org.gagravarr.vorbis.java.version = 0.8
/org.hsqldb/hsqldb = 2.4.0
/org.jdom/jdom2 = 2.0.6
-/org.jsoup/jsoup = 1.11.2
+/org.jsoup/jsoup = 1.11.3
/org.locationtech.jts/jts-core = 1.15.0
/org.locationtech.spatial4j/spatial4j = 0.7
@@ -296,7 +300,7 @@ org.slf4j.version = 1.7.24
/org.slf4j/slf4j-api = ${org.slf4j.version}
/org.slf4j/slf4j-simple = ${org.slf4j.version}
-/org.tallison/jmatio = 1.2
+/org.tallison/jmatio = 1.5
/org.tukaani/xz = 1.8
ua.net.nlp.morfologik-ukrainian-search.version = 3.9.0
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/lucene/licenses/commons-codec-1.10.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/commons-codec-1.10.jar.sha1 b/lucene/licenses/commons-codec-1.10.jar.sha1
deleted file mode 100644
index ebd32ce..0000000
--- a/lucene/licenses/commons-codec-1.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4b95f4897fa13f2cd904aee711aeafc0c5295cd8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/lucene/licenses/commons-codec-1.11.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/commons-codec-1.11.jar.sha1 b/lucene/licenses/commons-codec-1.11.jar.sha1
new file mode 100644
index 0000000..0ca9841
--- /dev/null
+++ b/lucene/licenses/commons-codec-1.11.jar.sha1
@@ -0,0 +1 @@
+3acb4705652e16236558f0f4f2192cc33c3bd189
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b79ef5a..637670a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -22,7 +22,7 @@ Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this r
Versions of Major Components
---------------------
-Apache Tika 1.18
+Apache Tika 1.19.1
Carrot2 3.16.0
Velocity 1.7 and Velocity Tools 2.0
Apache ZooKeeper 3.4.11
@@ -163,6 +163,8 @@ Other Changes
* SOLR-12835: Document statistics exposed by the Query Result Cache when maxRamMB is configured. (shalin)
+* SOLR-12423: Upgrade to Tika 1.19.1 when available (Tim Allison via Erick Erickson)
+
Bug Fixes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/contrib/extraction/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/ivy.xml b/solr/contrib/extraction/ivy.xml
index d4989ac..ec9483d 100644
--- a/solr/contrib/extraction/ivy.xml
+++ b/solr/contrib/extraction/ivy.xml
@@ -67,6 +67,8 @@
<dependency org="com.adobe.xmp" name="xmpcore" rev="${/com.adobe.xmp/xmpcore}" conf="compile"/>
<dependency org="com.pff" name="java-libpst" rev="${/com.pff/java-libpst}" conf="compile"/>
<dependency org="org.tallison" name="jmatio" rev="${/org.tallison/jmatio}" conf="compile"/>
+ <dependency org="com.epam" name="parso" rev="${/com.epam/parso}" conf="compile"/>
+ <dependency org="org.brotli" name="dec" rev="${/org.brotli/dec}" conf="compile"/>
<!-- Other ExtractingRequestHandler dependencies -->
<dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" conf="compile"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/apache-mime4j-core-0.8.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/apache-mime4j-core-0.8.1.jar.sha1 b/solr/licenses/apache-mime4j-core-0.8.1.jar.sha1
deleted file mode 100644
index bc78865..0000000
--- a/solr/licenses/apache-mime4j-core-0.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c62dfe18a3b827a2c626ade0ffba44562ddf3f61
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/apache-mime4j-core-0.8.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/apache-mime4j-core-0.8.2.jar.sha1 b/solr/licenses/apache-mime4j-core-0.8.2.jar.sha1
new file mode 100644
index 0000000..6afc490
--- /dev/null
+++ b/solr/licenses/apache-mime4j-core-0.8.2.jar.sha1
@@ -0,0 +1 @@
+94919d81969c67c5894646338bf10fbc35f5a946
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1
deleted file mode 100644
index 727798e..0000000
--- a/solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f2d653c617004193f3350330d907f77b60c88c56
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1 b/solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1
new file mode 100644
index 0000000..171a9d1
--- /dev/null
+++ b/solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1
@@ -0,0 +1 @@
+32c9a9afe84eca86a3b0b3c66a956ced249ceade
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/bcmail-jdk15on-1.54.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcmail-jdk15on-1.54.jar.sha1 b/solr/licenses/bcmail-jdk15on-1.54.jar.sha1
deleted file mode 100644
index c9176a6..0000000
--- a/solr/licenses/bcmail-jdk15on-1.54.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9d9b5432b4b29ef4a853223bc6e19379ef116cca
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/bcmail-jdk15on-1.60.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcmail-jdk15on-1.60.jar.sha1 b/solr/licenses/bcmail-jdk15on-1.60.jar.sha1
new file mode 100644
index 0000000..9cb6092
--- /dev/null
+++ b/solr/licenses/bcmail-jdk15on-1.60.jar.sha1
@@ -0,0 +1 @@
+df0250131a6e85e546ec5b1bf964f7f2ff3a42fc
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/bcpkix-jdk15on-1.54.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcpkix-jdk15on-1.54.jar.sha1 b/solr/licenses/bcpkix-jdk15on-1.54.jar.sha1
deleted file mode 100644
index f0602d6..0000000
--- a/solr/licenses/bcpkix-jdk15on-1.54.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b11bfee99bb11eea344de6e4a07fe89212c55c02
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/bcpkix-jdk15on-1.60.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcpkix-jdk15on-1.60.jar.sha1 b/solr/licenses/bcpkix-jdk15on-1.60.jar.sha1
new file mode 100644
index 0000000..45e955a
--- /dev/null
+++ b/solr/licenses/bcpkix-jdk15on-1.60.jar.sha1
@@ -0,0 +1 @@
+d0c46320fbc07be3a24eb13a56cee4e3d38e0c75
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/bcprov-jdk15on-1.54.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcprov-jdk15on-1.54.jar.sha1 b/solr/licenses/bcprov-jdk15on-1.54.jar.sha1
deleted file mode 100644
index 3f869ac..0000000
--- a/solr/licenses/bcprov-jdk15on-1.54.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1acdedeb89f1d950d67b73d481eb7736df65eedb
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/bcprov-jdk15on-1.60.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/bcprov-jdk15on-1.60.jar.sha1 b/solr/licenses/bcprov-jdk15on-1.60.jar.sha1
new file mode 100644
index 0000000..3fc67c7
--- /dev/null
+++ b/solr/licenses/bcprov-jdk15on-1.60.jar.sha1
@@ -0,0 +1 @@
+bd47ad3bd14b8e82595c7adaa143501e60842a84
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/commons-codec-1.10.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/commons-codec-1.10.jar.sha1 b/solr/licenses/commons-codec-1.10.jar.sha1
deleted file mode 100644
index ebd32ce..0000000
--- a/solr/licenses/commons-codec-1.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4b95f4897fa13f2cd904aee711aeafc0c5295cd8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/commons-codec-1.11.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/commons-codec-1.11.jar.sha1 b/solr/licenses/commons-codec-1.11.jar.sha1
new file mode 100644
index 0000000..0ca9841
--- /dev/null
+++ b/solr/licenses/commons-codec-1.11.jar.sha1
@@ -0,0 +1 @@
+3acb4705652e16236558f0f4f2192cc33c3bd189
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/commons-collections4-4.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/commons-collections4-4.1.jar.sha1 b/solr/licenses/commons-collections4-4.1.jar.sha1
deleted file mode 100644
index c554bdc..0000000
--- a/solr/licenses/commons-collections4-4.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a4cf4688fe1c7e3a63aa636cc96d013af537768e
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/commons-collections4-4.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/commons-collections4-4.2.jar.sha1 b/solr/licenses/commons-collections4-4.2.jar.sha1
new file mode 100644
index 0000000..e001863
--- /dev/null
+++ b/solr/licenses/commons-collections4-4.2.jar.sha1
@@ -0,0 +1 @@
+54ebea0a5b653d3c680131e73fe807bb8f78c4ed
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/dec-0.1.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/dec-0.1.2.jar.sha1 b/solr/licenses/dec-0.1.2.jar.sha1
new file mode 100644
index 0000000..e52fb64
--- /dev/null
+++ b/solr/licenses/dec-0.1.2.jar.sha1
@@ -0,0 +1 @@
+0c26a897ae0d524809eef1c786cc6183b4ddcc3b
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/dec-LICENSE-MIT.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/dec-LICENSE-MIT.txt b/solr/licenses/dec-LICENSE-MIT.txt
new file mode 100644
index 0000000..0fe2422
--- /dev/null
+++ b/solr/licenses/dec-LICENSE-MIT.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/dec-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/dec-NOTICE.txt b/solr/licenses/dec-NOTICE.txt
new file mode 100644
index 0000000..0fe2422
--- /dev/null
+++ b/solr/licenses/dec-NOTICE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/fontbox-2.0.12.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/fontbox-2.0.12.jar.sha1 b/solr/licenses/fontbox-2.0.12.jar.sha1
new file mode 100644
index 0000000..8ded8ca
--- /dev/null
+++ b/solr/licenses/fontbox-2.0.12.jar.sha1
@@ -0,0 +1 @@
+566fd1d6b25012bb82078da08b82e6d0ba8c884a
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/fontbox-2.0.9.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/fontbox-2.0.9.jar.sha1 b/solr/licenses/fontbox-2.0.9.jar.sha1
deleted file mode 100644
index 1fbba18..0000000
--- a/solr/licenses/fontbox-2.0.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f961f17ebdbc307e9055e3cf7c0e207f0895ae55
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/isoparser-1.1.18.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/isoparser-1.1.18.jar.sha1 b/solr/licenses/isoparser-1.1.18.jar.sha1
deleted file mode 100644
index 56ee07f..0000000
--- a/solr/licenses/isoparser-1.1.18.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c74bdac64b22f1e245a7657149a43437aae4a9d3
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/isoparser-1.1.22.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/isoparser-1.1.22.jar.sha1 b/solr/licenses/isoparser-1.1.22.jar.sha1
new file mode 100644
index 0000000..be8f2ad
--- /dev/null
+++ b/solr/licenses/isoparser-1.1.22.jar.sha1
@@ -0,0 +1 @@
+70b5c26b52c120d2e94643717a764c4a67640fd6
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jackcess-2.1.10.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackcess-2.1.10.jar.sha1 b/solr/licenses/jackcess-2.1.10.jar.sha1
deleted file mode 100644
index 0d946a0..0000000
--- a/solr/licenses/jackcess-2.1.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4a10b9316831c2fc1f87853bb6745909dab5a8a5
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jackcess-2.1.12.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackcess-2.1.12.jar.sha1 b/solr/licenses/jackcess-2.1.12.jar.sha1
new file mode 100644
index 0000000..49fe421
--- /dev/null
+++ b/solr/licenses/jackcess-2.1.12.jar.sha1
@@ -0,0 +1 @@
+8a422b016925475b2234b576a0f7ee3f55f1f9e2
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jackson-annotations-2.9.5.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackson-annotations-2.9.5.jar.sha1 b/solr/licenses/jackson-annotations-2.9.5.jar.sha1
deleted file mode 100644
index 4d7ff74..0000000
--- a/solr/licenses/jackson-annotations-2.9.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9056ec9db21c57d43219a84bb18c129ae51c6a5d
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jackson-annotations-2.9.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackson-annotations-2.9.6.jar.sha1 b/solr/licenses/jackson-annotations-2.9.6.jar.sha1
new file mode 100644
index 0000000..76db6d1
--- /dev/null
+++ b/solr/licenses/jackson-annotations-2.9.6.jar.sha1
@@ -0,0 +1 @@
+6a0f0f154edaba00067772ce02e24f8c0973d84c
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jackson-core-2.9.5.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackson-core-2.9.5.jar.sha1 b/solr/licenses/jackson-core-2.9.5.jar.sha1
deleted file mode 100644
index b5a7248..0000000
--- a/solr/licenses/jackson-core-2.9.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a22ac51016944b06fd9ffbc9541c6e7ce5eea117
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jackson-core-2.9.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackson-core-2.9.6.jar.sha1 b/solr/licenses/jackson-core-2.9.6.jar.sha1
new file mode 100644
index 0000000..32a1b7c
--- /dev/null
+++ b/solr/licenses/jackson-core-2.9.6.jar.sha1
@@ -0,0 +1 @@
+4e393793c37c77e042ccc7be5a914ae39251b365
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jackson-databind-2.9.5.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackson-databind-2.9.5.jar.sha1 b/solr/licenses/jackson-databind-2.9.5.jar.sha1
deleted file mode 100644
index db2ea79..0000000
--- a/solr/licenses/jackson-databind-2.9.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3490508379d065fe3fcb80042b62f630f7588606
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jackson-databind-2.9.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackson-databind-2.9.6.jar.sha1 b/solr/licenses/jackson-databind-2.9.6.jar.sha1
new file mode 100644
index 0000000..2fb49ad
--- /dev/null
+++ b/solr/licenses/jackson-databind-2.9.6.jar.sha1
@@ -0,0 +1 @@
+cfa4f316351a91bfd95cb0644c6a2c95f52db1fc
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jackson-dataformat-smile-2.9.5.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackson-dataformat-smile-2.9.5.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.9.5.jar.sha1
deleted file mode 100644
index 0406c1e..0000000
--- a/solr/licenses/jackson-dataformat-smile-2.9.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dbc8efaf5c70004dfb4ac5db6fa7e12534ada22d
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jackson-dataformat-smile-2.9.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jackson-dataformat-smile-2.9.6.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.9.6.jar.sha1
new file mode 100644
index 0000000..d0e35b9
--- /dev/null
+++ b/solr/licenses/jackson-dataformat-smile-2.9.6.jar.sha1
@@ -0,0 +1 @@
+3b5afd355921c359e365accaa60f7f30709e35e7
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jempbox-1.8.13.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jempbox-1.8.13.jar.sha1 b/solr/licenses/jempbox-1.8.13.jar.sha1
deleted file mode 100644
index b1b5bdc..0000000
--- a/solr/licenses/jempbox-1.8.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a874cef0ed0e2a8c4cc5ed52c23ba3e6d78eca4e
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jempbox-1.8.16.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jempbox-1.8.16.jar.sha1 b/solr/licenses/jempbox-1.8.16.jar.sha1
new file mode 100644
index 0000000..9f6f793
--- /dev/null
+++ b/solr/licenses/jempbox-1.8.16.jar.sha1
@@ -0,0 +1 @@
+1f41de81768ef84ca2d8cda4cb79e9272c8ee966
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jmatio-1.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jmatio-1.2.jar.sha1 b/solr/licenses/jmatio-1.2.jar.sha1
deleted file mode 100644
index 5941dc9..0000000
--- a/solr/licenses/jmatio-1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-69d8f2f49c1503f9b15b0eb50b1905a734a025e2
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jmatio-1.5.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jmatio-1.5.jar.sha1 b/solr/licenses/jmatio-1.5.jar.sha1
new file mode 100644
index 0000000..45ca675
--- /dev/null
+++ b/solr/licenses/jmatio-1.5.jar.sha1
@@ -0,0 +1 @@
+517d932cc87a3b564f3f7a07ac347b725b619ab4
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jsoup-1.11.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jsoup-1.11.2.jar.sha1 b/solr/licenses/jsoup-1.11.2.jar.sha1
deleted file mode 100644
index b4a888c..0000000
--- a/solr/licenses/jsoup-1.11.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e3eeb8a0b4ce1db246059a41e353cd7413dad226
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/jsoup-1.11.3.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/jsoup-1.11.3.jar.sha1 b/solr/licenses/jsoup-1.11.3.jar.sha1
new file mode 100644
index 0000000..1b814dc
--- /dev/null
+++ b/solr/licenses/jsoup-1.11.3.jar.sha1
@@ -0,0 +1 @@
+36da09a8f68484523fa2aaa100399d612b247d67
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/metadata-extractor-2.10.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/metadata-extractor-2.10.1.jar.sha1 b/solr/licenses/metadata-extractor-2.10.1.jar.sha1
deleted file mode 100644
index 9da3826..0000000
--- a/solr/licenses/metadata-extractor-2.10.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e1852a8f519dbb0196fdb41bf2c584a8858189f8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/metadata-extractor-2.11.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/metadata-extractor-2.11.0.jar.sha1 b/solr/licenses/metadata-extractor-2.11.0.jar.sha1
new file mode 100644
index 0000000..39a443b
--- /dev/null
+++ b/solr/licenses/metadata-extractor-2.11.0.jar.sha1
@@ -0,0 +1 @@
+5f11883f6d06a16ca5fb8a9edf7c6c1237a92da0
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/parso-2.0.9.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/parso-2.0.9.jar.sha1 b/solr/licenses/parso-2.0.9.jar.sha1
new file mode 100644
index 0000000..d292e7e
--- /dev/null
+++ b/solr/licenses/parso-2.0.9.jar.sha1
@@ -0,0 +1 @@
+615d910051b7c4695397e6686cf840caf6216e19
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/parso-LICENSE-ASL.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/parso-LICENSE-ASL.txt b/solr/licenses/parso-LICENSE-ASL.txt
new file mode 100644
index 0000000..3761b7e
--- /dev/null
+++ b/solr/licenses/parso-LICENSE-ASL.txt
@@ -0,0 +1,234 @@
+
+ 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.
+CONTRIBUTIONS TO THE ORIGINAL CODEBASE
+
+Apache FontBox is based on contributions made to the original FontBox project:
+
+ Copyright (c) 2006-2007, www.fontbox.org
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of fontbox; nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/parso-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/parso-NOTICE.txt b/solr/licenses/parso-NOTICE.txt
new file mode 100644
index 0000000..3761b7e
--- /dev/null
+++ b/solr/licenses/parso-NOTICE.txt
@@ -0,0 +1,234 @@
+
+ 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.
+CONTRIBUTIONS TO THE ORIGINAL CODEBASE
+
+Apache FontBox is based on contributions made to the original FontBox project:
+
+ Copyright (c) 2006-2007, www.fontbox.org
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of fontbox; nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/pdfbox-2.0.12.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-2.0.12.jar.sha1 b/solr/licenses/pdfbox-2.0.12.jar.sha1
new file mode 100644
index 0000000..d190b7e
--- /dev/null
+++ b/solr/licenses/pdfbox-2.0.12.jar.sha1
@@ -0,0 +1 @@
+a7311cd267c19e1ba8154b076a63d29537154784
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/pdfbox-2.0.9.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-2.0.9.jar.sha1 b/solr/licenses/pdfbox-2.0.9.jar.sha1
deleted file mode 100644
index 35f04eb..0000000
--- a/solr/licenses/pdfbox-2.0.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d0425578218624388f2ec84a0b3a11efd55df0f5
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/pdfbox-tools-2.0.12.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-tools-2.0.12.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.12.jar.sha1
new file mode 100644
index 0000000..226084a
--- /dev/null
+++ b/solr/licenses/pdfbox-tools-2.0.12.jar.sha1
@@ -0,0 +1 @@
+0e4569e8364f33be1c0af889f62b0f8f4dca7d45
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/pdfbox-tools-2.0.9.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/pdfbox-tools-2.0.9.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.9.jar.sha1
deleted file mode 100644
index 6c1e535..0000000
--- a/solr/licenses/pdfbox-tools-2.0.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-90a58b4daf37697488339845e0a3e0d3609eb781
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/poi-3.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-3.17.jar.sha1 b/solr/licenses/poi-3.17.jar.sha1
deleted file mode 100644
index 4b5792b..0000000
--- a/solr/licenses/poi-3.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0ae92292a2043888b40d418da97dc0b669fde326
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/poi-4.0.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-4.0.0.jar.sha1 b/solr/licenses/poi-4.0.0.jar.sha1
new file mode 100644
index 0000000..503cc5b
--- /dev/null
+++ b/solr/licenses/poi-4.0.0.jar.sha1
@@ -0,0 +1 @@
+7ddb9b983ed682c93a986e8bb596d5935b13086c
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/poi-ooxml-3.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-3.17.jar.sha1 b/solr/licenses/poi-ooxml-3.17.jar.sha1
deleted file mode 100644
index b124d1e..0000000
--- a/solr/licenses/poi-ooxml-3.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-07d8c44407178b73246462842bf1e206e99c8e0a
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/poi-ooxml-4.0.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-4.0.0.jar.sha1 b/solr/licenses/poi-ooxml-4.0.0.jar.sha1
new file mode 100644
index 0000000..82f38e8
--- /dev/null
+++ b/solr/licenses/poi-ooxml-4.0.0.jar.sha1
@@ -0,0 +1 @@
+f3fa9c2bd64eb3ec15378de960a07d077ae5b26d
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/poi-ooxml-schemas-3.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-schemas-3.17.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.17.jar.sha1
deleted file mode 100644
index 51eb0c0..0000000
--- a/solr/licenses/poi-ooxml-schemas-3.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-890114bfa82f5b6380ea0e9b0bf49b0af797b414
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1 b/solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1
new file mode 100644
index 0000000..6edf823
--- /dev/null
+++ b/solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1
@@ -0,0 +1 @@
+125f9ccd2cf652fa4169b1c30e9023362e23324f
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/poi-scratchpad-3.17.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-scratchpad-3.17.jar.sha1 b/solr/licenses/poi-scratchpad-3.17.jar.sha1
deleted file mode 100644
index b23f0e8..0000000
--- a/solr/licenses/poi-scratchpad-3.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-85d86a0e26c7f5c0db4ee63e8c7728e51c5d64ce
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/poi-scratchpad-4.0.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/poi-scratchpad-4.0.0.jar.sha1 b/solr/licenses/poi-scratchpad-4.0.0.jar.sha1
new file mode 100644
index 0000000..ba817ee
--- /dev/null
+++ b/solr/licenses/poi-scratchpad-4.0.0.jar.sha1
@@ -0,0 +1 @@
+1038d3bb1ec34e93c184b4c5b690e2f51c6f7a60
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/tika-core-1.18.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-core-1.18.jar.sha1 b/solr/licenses/tika-core-1.18.jar.sha1
deleted file mode 100644
index 11e6fe6..0000000
--- a/solr/licenses/tika-core-1.18.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-69556697de96cf0b22df846e970dafd29866eee0
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/tika-core-1.19.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-core-1.19.1.jar.sha1 b/solr/licenses/tika-core-1.19.1.jar.sha1
new file mode 100644
index 0000000..d144852
--- /dev/null
+++ b/solr/licenses/tika-core-1.19.1.jar.sha1
@@ -0,0 +1 @@
+c1f075aa01586c2c28a249ad60bcfb733b69b866
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/tika-java7-1.18.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-java7-1.18.jar.sha1 b/solr/licenses/tika-java7-1.18.jar.sha1
deleted file mode 100644
index f0f9282..0000000
--- a/solr/licenses/tika-java7-1.18.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-07891212df835f740be0ca92040280915b0cd9d4
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/tika-java7-1.19.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-java7-1.19.1.jar.sha1 b/solr/licenses/tika-java7-1.19.1.jar.sha1
new file mode 100644
index 0000000..a5459a9
--- /dev/null
+++ b/solr/licenses/tika-java7-1.19.1.jar.sha1
@@ -0,0 +1 @@
+02661fd12fd9f0223e522dca72c1296108561263
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/tika-parsers-1.18.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-parsers-1.18.jar.sha1 b/solr/licenses/tika-parsers-1.18.jar.sha1
deleted file mode 100644
index bf84c0a..0000000
--- a/solr/licenses/tika-parsers-1.18.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7d9b6dea91d783165f3313d320d3aaaa9a4dfc13
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/tika-parsers-1.19.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-parsers-1.19.1.jar.sha1 b/solr/licenses/tika-parsers-1.19.1.jar.sha1
new file mode 100644
index 0000000..638428d
--- /dev/null
+++ b/solr/licenses/tika-parsers-1.19.1.jar.sha1
@@ -0,0 +1 @@
+06d45a8683a7479f0e0d9d252f834d0ae44abd6b
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/tika-xmp-1.18.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-xmp-1.18.jar.sha1 b/solr/licenses/tika-xmp-1.18.jar.sha1
deleted file mode 100644
index 734fd64..0000000
--- a/solr/licenses/tika-xmp-1.18.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-85eb7fbe700291159ea8c072e8158f1beb5f66ab
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/tika-xmp-1.19.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/tika-xmp-1.19.1.jar.sha1 b/solr/licenses/tika-xmp-1.19.1.jar.sha1
new file mode 100644
index 0000000..80f2513
--- /dev/null
+++ b/solr/licenses/tika-xmp-1.19.1.jar.sha1
@@ -0,0 +1 @@
+3b1bb7e00262813b3ef08b414fa0d5d06c45f2bb
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/xmlbeans-2.6.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/xmlbeans-2.6.0.jar.sha1 b/solr/licenses/xmlbeans-2.6.0.jar.sha1
deleted file mode 100644
index d27c56f..0000000
--- a/solr/licenses/xmlbeans-2.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-29e80d2dd51f9dcdef8f9ffaee0d4dc1c9bbfc87
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc886497/solr/licenses/xmlbeans-3.0.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/xmlbeans-3.0.1.jar.sha1 b/solr/licenses/xmlbeans-3.0.1.jar.sha1
new file mode 100644
index 0000000..5b1d358
--- /dev/null
+++ b/solr/licenses/xmlbeans-3.0.1.jar.sha1
@@ -0,0 +1 @@
+50d94da791ab1e799a11d6f82410fd7d49f402ca
[8/8] lucene-solr:jira/http2: Fix ref guide precommit
Posted by da...@apache.org.
Fix ref guide precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d4061227
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d4061227
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d4061227
Branch: refs/heads/jira/http2
Commit: d406122719bc9fb76d4478bc76ae63d7d3f05ac3
Parents: ca60757
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Oct 19 07:49:45 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Oct 19 07:49:45 2018 +0700
----------------------------------------------------------------------
solr/solr-ref-guide/src/major-changes-in-solr-8.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d4061227/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc
index 501612a..ac29f45 100644
--- a/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc
+++ b/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc
@@ -24,7 +24,7 @@
Solr 8 is a major new release of Solr which introduces new features and a number of other changes that may impact your existing installation.
-== Upgrade Planning
+== Solr 8 Upgrade Planning
Due to the introduction of LIR redesign since Solr 7.3 (SOLR-11702) and the removing of old LIR implementation in Solr 8.
Rolling updates are not possible unless all nodes must be on Solr 7.3 or higher. If not updates can be lost.
[3/8] lucene-solr:jira/http2: LUCENE-6572: Remove dependency on
analyzer-common from highlighing
Posted by da...@apache.org.
LUCENE-6572: Remove dependency on analyzer-common from highlighing
This makes a simplifed copy of LimitTokenOffsetFilter to the highlighting
module to detach the dependency on analyzer-common.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/11a1b8c1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/11a1b8c1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/11a1b8c1
Branch: refs/heads/jira/http2
Commit: 11a1b8c1a8fdca9f6314bd61695345737309b630
Parents: 635d1ea
Author: Simon Willnauer <si...@apache.org>
Authored: Wed Oct 17 10:16:31 2018 +0200
Committer: Simon Willnauer <si...@apache.org>
Committed: Wed Oct 17 11:46:56 2018 +0200
----------------------------------------------------------------------
lucene/highlighter/build.xml | 9 +++-
.../highlight/LimitTokenOffsetFilter.java | 52 ++++++++++++++++++++
.../lucene/search/highlight/TokenSources.java | 1 -
3 files changed, 60 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/11a1b8c1/lucene/highlighter/build.xml
----------------------------------------------------------------------
diff --git a/lucene/highlighter/build.xml b/lucene/highlighter/build.xml
index e0dfa7e..ed6cc74 100644
--- a/lucene/highlighter/build.xml
+++ b/lucene/highlighter/build.xml
@@ -32,10 +32,17 @@
<pathelement path="${memory.jar}"/>
<pathelement path="${queries.jar}"/>
<pathelement path="${join.jar}"/>
- <pathelement path="${analyzers-common.jar}"/>
<path refid="base.classpath"/>
</path>
+ <path id="test.classpath">
+ <pathelement path="${memory.jar}"/>
+ <pathelement path="${queries.jar}"/>
+ <pathelement path="${join.jar}"/>
+ <pathelement path="${analyzers-common.jar}"/>
+ <path refid="test.base.classpath"/>
+ </path>
+
<target name="compile-core" depends="jar-memory,jar-queries,jar-join,jar-analyzers-common,common.compile-core" />
<target name="javadocs" depends="javadocs-memory,compile-core,check-javadocs-uptodate"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/11a1b8c1/lucene/highlighter/src/java/org/apache/lucene/search/highlight/LimitTokenOffsetFilter.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/LimitTokenOffsetFilter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/LimitTokenOffsetFilter.java
new file mode 100644
index 0000000..149584e
--- /dev/null
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/LimitTokenOffsetFilter.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.lucene.search.highlight;
+
+import java.io.IOException;
+
+import org.apache.lucene.analysis.TokenFilter;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+
+/**
+ * This is a simplified version of org.apache.lucene.analysis.miscellaneous.LimitTokenOffsetFilter to prevent
+ * a dependency on analyzers-common.jar.
+ */
+final class LimitTokenOffsetFilter extends TokenFilter {
+
+ private final OffsetAttribute offsetAttrib = addAttribute(OffsetAttribute.class);
+ private int maxStartOffset;
+
+ LimitTokenOffsetFilter(TokenStream input, int maxStartOffset) {
+ super(input);
+ if (maxStartOffset < 0) {
+ throw new IllegalArgumentException("maxStartOffset must be >= zero");
+ }
+ this.maxStartOffset = maxStartOffset;
+ }
+
+ @Override
+ public boolean incrementToken() throws IOException {
+ if (!input.incrementToken()) {
+ return false;
+ }
+ if (offsetAttrib.startOffset() <= maxStartOffset) {
+ return true;
+ }
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/11a1b8c1/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
index 2730f40..0c0a63f 100644
--- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.miscellaneous.LimitTokenOffsetFilter;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;