Update to 6.3.0

PR:		215389
Submitted by:	idefix@fechner.net (maintainer)

4 files changed, 117 insertions, 60 deletions

diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index a333c8a5d726..aa1d10ae02dc 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	apache-solr
-PORTVERSION=	6.2.0
+PORTVERSION=	6.3.0
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/lucene/solr/${PORTVERSION}
 DISTNAME=	solr-${PORTVERSION}
@@ -39,11 +39,12 @@ do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/solr ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin
 	${INSTALL_DATA} ${WRKSRC}/bin/solr.in.sh ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
-	${ECHO} SOLR_HOME=\"/var/db/solr\" >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
-	${ECHO} LOG4J_PROPS=\"/var/db/solr/log4j.properties\" >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
-	${ECHO} SOLR_LOGS_DIR=\"/var/log/solr\" >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
-	${ECHO} SOLR_PORT=\"8983\" >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
-	${ECHO} SOLR_PID_DIR=\"/var/db/solr\" >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+	${ECHO} 'SOLR_HOME="/var/db/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+	${ECHO} 'LOG4J_PROPS="/var/db/solr/log4j.properties"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+	${ECHO} 'SOLR_LOGS_DIR="/var/log/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+	${ECHO} 'SOLR_PORT="8983"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+	${ECHO} 'SOLR_PID_DIR="/var/db/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+	${ECHO} 'SOLR_OPTS="$$SOLR_OPTS -Djetty.host=localhost"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
 
 	${MKDIR} ${STAGEDIR}/var/db/solr
 	${MKDIR} ${STAGEDIR}/var/log/solr
diff --git a/textproc/apache-solr/distinfo b/textproc/apache-solr/distinfo
index 61f65099ae65..c0f01b5ced7f 100644
--- a/textproc/apache-solr/distinfo
+++ b/textproc/apache-solr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472734642
-SHA256 (solr-6.2.0.tgz) = ba7c93e1c8d28717d6d84788ebdc2e8e9211a32f48b5a30b2a904762a0b7cd39
-SIZE (solr-6.2.0.tgz) = 149049622
+TIMESTAMP = 1482064624
+SHA256 (solr-6.3.0.tgz) = 07692257575fe54ddb8a8f64e96d3d352f2f533aa91b5752be1869d2acf2f544
+SIZE (solr-6.3.0.tgz) = 146004505
diff --git a/textproc/apache-solr/files/patch-bind-localhost.patch b/textproc/apache-solr/files/patch-bind-localhost.patch
deleted file mode 100644
index a65161ec5a35..000000000000
--- a/textproc/apache-solr/files/patch-bind-localhost.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- server/etc/jetty-http.xml.bak	2016-09-01 16:16:13.027176858 +0200
-+++ server/etc/jetty-http.xml	2016-09-01 16:16:40.498173610 +0200
-@@ -33,7 +33,7 @@
-             </Item>
-           </Array>
-         </Arg>
--        <Set name="host"><Property name="jetty.host" /></Set>
-+        <Set name="host"><Property name="jetty.host" default="localhost" /></Set>
-         <Set name="port"><Property name="jetty.port" default="8983" /></Set>
-         <Set name="idleTimeout"><Property name="solr.jetty.http.idleTimeout" default="50000"/></Set>
-         <Set name="soLingerTime"><Property name="solr.jetty.http.soLingerTime" default="-1"/></Set>
-@@ -44,4 +44,4 @@
-     </Arg>
-   </Call>
- 
--</Configure>
-\ No newline at end of file
-+</Configure>
diff --git a/textproc/apache-solr/pkg-plist b/textproc/apache-solr/pkg-plist
index 12cd92918847..623c9d6d0632 100644
--- a/textproc/apache-solr/pkg-plist
+++ b/textproc/apache-solr/pkg-plist
@@ -16,9 +16,9 @@ solr/bin/solr.in.cmd
 solr/bin/solr.in.sh
 solr/contrib/analysis-extras/README.txt
 solr/contrib/analysis-extras/lib/icu4j-56.1.jar
-solr/contrib/analysis-extras/lib/morfologik-fsa-2.1.0.jar
-solr/contrib/analysis-extras/lib/morfologik-polish-2.1.0.jar
-solr/contrib/analysis-extras/lib/morfologik-stemming-2.1.0.jar
+solr/contrib/analysis-extras/lib/morfologik-fsa-2.1.1.jar
+solr/contrib/analysis-extras/lib/morfologik-polish-2.1.1.jar
+solr/contrib/analysis-extras/lib/morfologik-stemming-2.1.1.jar
 solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-%%PORTVERSION%%.jar
 solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-%%PORTVERSION%%.jar
 solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-%%PORTVERSION%%.jar
@@ -120,13 +120,9 @@ solr/dist/solr-test-framework-%%PORTVERSION%%.jar
 solr/dist/solr-uima-%%PORTVERSION%%.jar
 solr/dist/solr-velocity-%%PORTVERSION%%.jar
 solr/dist/solrj-lib/commons-io-2.5.jar
-solr/dist/solrj-lib/guava-14.0.1.jar
 solr/dist/solrj-lib/httpclient-4.4.1.jar
 solr/dist/solrj-lib/httpcore-4.4.1.jar
 solr/dist/solrj-lib/httpmime-4.4.1.jar
-solr/dist/solrj-lib/jackson-annotations-2.5.4.jar
-solr/dist/solrj-lib/jackson-core-2.5.4.jar
-solr/dist/solrj-lib/jackson-databind-2.5.4.jar
 solr/dist/solrj-lib/jcl-over-slf4j-1.7.7.jar
 solr/dist/solrj-lib/noggit-0.6.jar
 solr/dist/solrj-lib/slf4j-api-1.7.7.jar
@@ -136,8 +132,8 @@ solr/dist/solrj-lib/zookeeper-3.4.6.jar
 solr/dist/test-framework/README.txt
 solr/dist/test-framework/lib/ant-1.8.2.jar
 solr/dist/test-framework/lib/junit-4.10.jar
-solr/dist/test-framework/lib/junit4-ant-2.3.4.jar
-solr/dist/test-framework/lib/randomizedtesting-runner-2.3.4.jar
+solr/dist/test-framework/lib/junit4-ant-2.4.0.jar
+solr/dist/test-framework/lib/randomizedtesting-runner-2.4.0.jar
 solr/dist/test-framework/lucene-libs/lucene-test-framework-%%PORTVERSION%%.jar
 solr/docs/SYSTEM_REQUIREMENTS.html
 solr/docs/changes/Changes.html
@@ -376,6 +372,7 @@ solr/docs/solr-cell/org/apache/solr/handler/extraction/ParseContextConfig.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/SolrContentHandler.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/SolrContentHandlerFactory.html
+solr/docs/solr-cell/org/apache/solr/handler/extraction/XLSXResponseWriter.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/ExtractingDocumentLoader.MostlyPassthroughHtmlMapper.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/ExtractingDocumentLoader.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/ExtractingMetadataConstants.html
@@ -386,6 +383,7 @@ solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/ParseContextCon
 solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/RegexRulesPasswordProvider.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/SolrContentHandler.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/SolrContentHandlerFactory.html
+solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/XLSXResponseWriter.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/package-frame.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/package-summary.html
 solr/docs/solr-cell/org/apache/solr/handler/extraction/package-tree.html
@@ -484,12 +482,14 @@ solr/docs/solr-core/org/apache/solr/cloud/CloudUtil.html
 solr/docs/solr-core/org/apache/solr/cloud/CreateAliasCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/CreateCollectionCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/CreateShardCmd.html
+solr/docs/solr-core/org/apache/solr/cloud/CreateSnapshotCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/CurrentCoreDescriptorProvider.html
 solr/docs/solr-core/org/apache/solr/cloud/DeleteAliasCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/DeleteCollectionCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/DeleteNodeCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/DeleteReplicaCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/DeleteShardCmd.html
+solr/docs/solr-core/org/apache/solr/cloud/DeleteSnapshotCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/DistributedMap.html
 solr/docs/solr-core/org/apache/solr/cloud/DistributedQueue.html
 solr/docs/solr-core/org/apache/solr/cloud/ElectionContext.html
@@ -543,12 +543,14 @@ solr/docs/solr-core/org/apache/solr/cloud/class-use/CloudUtil.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/CreateAliasCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/CreateCollectionCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/CreateShardCmd.html
+solr/docs/solr-core/org/apache/solr/cloud/class-use/CreateSnapshotCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/CurrentCoreDescriptorProvider.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteAliasCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteCollectionCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteNodeCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteReplicaCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteShardCmd.html
+solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteSnapshotCmd.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/DistributedMap.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/DistributedQueue.html
 solr/docs/solr-core/org/apache/solr/cloud/class-use/ElectionContext.html
@@ -618,25 +620,21 @@ solr/docs/solr-core/org/apache/solr/cloud/package-summary.html
 solr/docs/solr-core/org/apache/solr/cloud/package-tree.html
 solr/docs/solr-core/org/apache/solr/cloud/package-use.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/ImplicitSnitch.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/RemoteCallback.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/ReplicaAssigner.Position.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/ReplicaAssigner.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/Rule.Condition.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/Rule.Operand.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/Rule.html
+solr/docs/solr-core/org/apache/solr/cloud/rule/ServerSnitchContext.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/Snitch.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/SnitchContext.SnitchInfo.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/SnitchContext.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/ImplicitSnitch.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/RemoteCallback.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/ReplicaAssigner.Position.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/ReplicaAssigner.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/Rule.Condition.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/Rule.Operand.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/Rule.html
+solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/ServerSnitchContext.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/Snitch.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/SnitchContext.SnitchInfo.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/SnitchContext.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/package-frame.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/package-summary.html
 solr/docs/solr-core/org/apache/solr/cloud/rule/package-tree.html
@@ -678,7 +676,6 @@ solr/docs/solr-core/org/apache/solr/core/InitParams.html
 solr/docs/solr-core/org/apache/solr/core/JmxMonitoredMap.JmxAugmentedSolrInfoMBean.html
 solr/docs/solr-core/org/apache/solr/core/JmxMonitoredMap.html
 solr/docs/solr-core/org/apache/solr/core/MMapDirectoryFactory.html
-solr/docs/solr-core/org/apache/solr/core/MapSerializable.html
 solr/docs/solr-core/org/apache/solr/core/MemClassLoader.html
 solr/docs/solr-core/org/apache/solr/core/NIOFSDirectoryFactory.html
 solr/docs/solr-core/org/apache/solr/core/NRTCachingDirectoryFactory.html
@@ -775,7 +772,6 @@ solr/docs/solr-core/org/apache/solr/core/class-use/InitParams.html
 solr/docs/solr-core/org/apache/solr/core/class-use/JmxMonitoredMap.JmxAugmentedSolrInfoMBean.html
 solr/docs/solr-core/org/apache/solr/core/class-use/JmxMonitoredMap.html
 solr/docs/solr-core/org/apache/solr/core/class-use/MMapDirectoryFactory.html
-solr/docs/solr-core/org/apache/solr/core/class-use/MapSerializable.html
 solr/docs/solr-core/org/apache/solr/core/class-use/MemClassLoader.html
 solr/docs/solr-core/org/apache/solr/core/class-use/NIOFSDirectoryFactory.html
 solr/docs/solr-core/org/apache/solr/core/class-use/NRTCachingDirectoryFactory.html
@@ -819,9 +815,15 @@ solr/docs/solr-core/org/apache/solr/core/package-frame.html
 solr/docs/solr-core/org/apache/solr/core/package-summary.html
 solr/docs/solr-core/org/apache/solr/core/package-tree.html
 solr/docs/solr-core/org/apache/solr/core/package-use.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.CoreSnapshotMetaData.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.SnapshotStatus.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.html
 solr/docs/solr-core/org/apache/solr/core/snapshots/SolrSnapshotManager.html
 solr/docs/solr-core/org/apache/solr/core/snapshots/SolrSnapshotMetaDataManager.SnapshotMetaData.html
 solr/docs/solr-core/org/apache/solr/core/snapshots/SolrSnapshotMetaDataManager.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/CollectionSnapshotMetaData.CoreSnapshotMetaData.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/CollectionSnapshotMetaData.SnapshotStatus.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/CollectionSnapshotMetaData.html
 solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/SolrSnapshotManager.html
 solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/SolrSnapshotMetaDataManager.SnapshotMetaData.html
 solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/SolrSnapshotMetaDataManager.html
@@ -842,6 +844,7 @@ solr/docs/solr-core/org/apache/solr/handler/CdcrParams.html
 solr/docs/solr-core/org/apache/solr/handler/CdcrReplicator.CdcrReplicatorException.html
 solr/docs/solr-core/org/apache/solr/handler/CdcrReplicator.html
 solr/docs/solr-core/org/apache/solr/handler/CdcrRequestHandler.html
+solr/docs/solr-core/org/apache/solr/handler/ClassifyStream.html
 solr/docs/solr-core/org/apache/solr/handler/ContentStreamHandlerBase.html
 solr/docs/solr-core/org/apache/solr/handler/ContentStreamLoader.html
 solr/docs/solr-core/org/apache/solr/handler/DocumentAnalysisRequestHandler.html
@@ -928,6 +931,7 @@ solr/docs/solr-core/org/apache/solr/handler/class-use/CdcrParams.html
 solr/docs/solr-core/org/apache/solr/handler/class-use/CdcrReplicator.CdcrReplicatorException.html
 solr/docs/solr-core/org/apache/solr/handler/class-use/CdcrReplicator.html
 solr/docs/solr-core/org/apache/solr/handler/class-use/CdcrRequestHandler.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ClassifyStream.html
 solr/docs/solr-core/org/apache/solr/handler/class-use/ContentStreamHandlerBase.html
 solr/docs/solr-core/org/apache/solr/handler/class-use/ContentStreamLoader.html
 solr/docs/solr-core/org/apache/solr/handler/class-use/DocumentAnalysisRequestHandler.html
@@ -1158,6 +1162,7 @@ solr/docs/solr-core/org/apache/solr/index/LogByteSizeMergePolicyFactory.html
 solr/docs/solr-core/org/apache/solr/index/LogDocMergePolicyFactory.html
 solr/docs/solr-core/org/apache/solr/index/MergePolicyFactory.html
 solr/docs/solr-core/org/apache/solr/index/MergePolicyFactoryArgs.html
+solr/docs/solr-core/org/apache/solr/index/NoMergePolicyFactory.html
 solr/docs/solr-core/org/apache/solr/index/SimpleMergePolicyFactory.html
 solr/docs/solr-core/org/apache/solr/index/SlowCompositeReaderWrapper.html
 solr/docs/solr-core/org/apache/solr/index/SortingMergePolicy.html
@@ -1170,6 +1175,7 @@ solr/docs/solr-core/org/apache/solr/index/class-use/LogByteSizeMergePolicyFactor
 solr/docs/solr-core/org/apache/solr/index/class-use/LogDocMergePolicyFactory.html
 solr/docs/solr-core/org/apache/solr/index/class-use/MergePolicyFactory.html
 solr/docs/solr-core/org/apache/solr/index/class-use/MergePolicyFactoryArgs.html
+solr/docs/solr-core/org/apache/solr/index/class-use/NoMergePolicyFactory.html
 solr/docs/solr-core/org/apache/solr/index/class-use/SimpleMergePolicyFactory.html
 solr/docs/solr-core/org/apache/solr/index/class-use/SlowCompositeReaderWrapper.html
 solr/docs/solr-core/org/apache/solr/index/class-use/SortingMergePolicy.html
@@ -1667,6 +1673,7 @@ solr/docs/solr-core/org/apache/solr/schema/package-frame.html
 solr/docs/solr-core/org/apache/solr/schema/package-summary.html
 solr/docs/solr-core/org/apache/solr/schema/package-tree.html
 solr/docs/solr-core/org/apache/solr/schema/package-use.html
+solr/docs/solr-core/org/apache/solr/search/AbstractReRankQuery.html
 solr/docs/solr-core/org/apache/solr/search/AnalyticsQuery.html
 solr/docs/solr-core/org/apache/solr/search/BitDocSet.html
 solr/docs/solr-core/org/apache/solr/search/BitsFilteredDocIdSet.html
@@ -1751,7 +1758,8 @@ solr/docs/solr-core/org/apache/solr/search/QueryUtils.html
 solr/docs/solr-core/org/apache/solr/search/QueryWrapperFilter.html
 solr/docs/solr-core/org/apache/solr/search/RankQuery.html
 solr/docs/solr-core/org/apache/solr/search/RawQParserPlugin.html
-solr/docs/solr-core/org/apache/solr/search/ReRankQParserPlugin.BoostedComp.html
+solr/docs/solr-core/org/apache/solr/search/ReRankCollector.BoostedComp.html
+solr/docs/solr-core/org/apache/solr/search/ReRankCollector.html
 solr/docs/solr-core/org/apache/solr/search/ReRankQParserPlugin.html
 solr/docs/solr-core/org/apache/solr/search/ReRankWeight.html
 solr/docs/solr-core/org/apache/solr/search/ReturnFields.html
@@ -1791,6 +1799,7 @@ solr/docs/solr-core/org/apache/solr/search/TextLogisticRegressionQParserPlugin.h
 solr/docs/solr-core/org/apache/solr/search/ValueSourceParser.html
 solr/docs/solr-core/org/apache/solr/search/WrappedQuery.html
 solr/docs/solr-core/org/apache/solr/search/XmlQParserPlugin.html
+solr/docs/solr-core/org/apache/solr/search/class-use/AbstractReRankQuery.html
 solr/docs/solr-core/org/apache/solr/search/class-use/AnalyticsQuery.html
 solr/docs/solr-core/org/apache/solr/search/class-use/BitDocSet.html
 solr/docs/solr-core/org/apache/solr/search/class-use/BitsFilteredDocIdSet.html
@@ -1875,7 +1884,8 @@ solr/docs/solr-core/org/apache/solr/search/class-use/QueryUtils.html
 solr/docs/solr-core/org/apache/solr/search/class-use/QueryWrapperFilter.html
 solr/docs/solr-core/org/apache/solr/search/class-use/RankQuery.html
 solr/docs/solr-core/org/apache/solr/search/class-use/RawQParserPlugin.html
-solr/docs/solr-core/org/apache/solr/search/class-use/ReRankQParserPlugin.BoostedComp.html
+solr/docs/solr-core/org/apache/solr/search/class-use/ReRankCollector.BoostedComp.html
+solr/docs/solr-core/org/apache/solr/search/class-use/ReRankCollector.html
 solr/docs/solr-core/org/apache/solr/search/class-use/ReRankQParserPlugin.html
 solr/docs/solr-core/org/apache/solr/search/class-use/ReRankWeight.html
 solr/docs/solr-core/org/apache/solr/search/class-use/ReturnFields.html
@@ -1919,17 +1929,21 @@ solr/docs/solr-core/org/apache/solr/search/facet/AggValueSource.html
 solr/docs/solr-core/org/apache/solr/search/facet/AvgAgg.html
 solr/docs/solr-core/org/apache/solr/search/facet/BlockJoin.html
 solr/docs/solr-core/org/apache/solr/search/facet/CountAgg.html
+solr/docs/solr-core/org/apache/solr/search/facet/FacetBucket.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetDebugInfo.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetField.FacetMethod.html
-solr/docs/solr-core/org/apache/solr/search/facet/FacetField.SortDirection.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetField.html
+solr/docs/solr-core/org/apache/solr/search/facet/FacetFieldMerger.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetMerger.Context.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetMerger.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetModule.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetProcessor.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetQuery.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetRange.html
+solr/docs/solr-core/org/apache/solr/search/facet/FacetRangeMerger.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetRequest.Domain.html
+solr/docs/solr-core/org/apache/solr/search/facet/FacetRequest.RefineMethod.html
+solr/docs/solr-core/org/apache/solr/search/facet/FacetRequest.SortDirection.html
 solr/docs/solr-core/org/apache/solr/search/facet/FacetRequest.html
 solr/docs/solr-core/org/apache/solr/search/facet/FieldUtil.html
 solr/docs/solr-core/org/apache/solr/search/facet/HLLAgg.HLLFactory.html
@@ -1955,17 +1969,21 @@ solr/docs/solr-core/org/apache/solr/search/facet/class-use/AggValueSource.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/AvgAgg.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/BlockJoin.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/CountAgg.html
+solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetBucket.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetDebugInfo.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetField.FacetMethod.html
-solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetField.SortDirection.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetField.html
+solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetFieldMerger.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetMerger.Context.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetMerger.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetModule.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetProcessor.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetQuery.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRange.html
+solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRangeMerger.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRequest.Domain.html
+solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRequest.RefineMethod.html
+solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRequest.SortDirection.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRequest.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/FieldUtil.html
 solr/docs/solr-core/org/apache/solr/search/facet/class-use/HLLAgg.HLLFactory.html
@@ -2469,6 +2487,7 @@ solr/docs/solr-core/org/apache/solr/update/IndexFingerprint.html
 solr/docs/solr-core/org/apache/solr/update/LoggingInfoStream.html
 solr/docs/solr-core/org/apache/solr/update/MemOutputStream.html
 solr/docs/solr-core/org/apache/solr/update/MergeIndexesCommand.html
+solr/docs/solr-core/org/apache/solr/update/PeerSync.PeerSyncResult.html
 solr/docs/solr-core/org/apache/solr/update/PeerSync.html
 solr/docs/solr-core/org/apache/solr/update/RollbackUpdateCommand.html
 solr/docs/solr-core/org/apache/solr/update/SolrCmdDistributor.AbortCheck.html
@@ -2526,6 +2545,7 @@ solr/docs/solr-core/org/apache/solr/update/class-use/IndexFingerprint.html
 solr/docs/solr-core/org/apache/solr/update/class-use/LoggingInfoStream.html
 solr/docs/solr-core/org/apache/solr/update/class-use/MemOutputStream.html
 solr/docs/solr-core/org/apache/solr/update/class-use/MergeIndexesCommand.html
+solr/docs/solr-core/org/apache/solr/update/class-use/PeerSync.PeerSyncResult.html
 solr/docs/solr-core/org/apache/solr/update/class-use/PeerSync.html
 solr/docs/solr-core/org/apache/solr/update/class-use/RollbackUpdateCommand.html
 solr/docs/solr-core/org/apache/solr/update/class-use/SolrCmdDistributor.AbortCheck.html
@@ -2623,6 +2643,8 @@ solr/docs/solr-core/org/apache/solr/update/processor/Signature.html
 solr/docs/solr-core/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.html
 solr/docs/solr-core/org/apache/solr/update/processor/SimpleUpdateProcessorFactory.html
 solr/docs/solr-core/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.html
+solr/docs/solr-core/org/apache/solr/update/processor/TemplateUpdateProcessorFactory.Resolved.html
+solr/docs/solr-core/org/apache/solr/update/processor/TemplateUpdateProcessorFactory.html
 solr/docs/solr-core/org/apache/solr/update/processor/TextProfileSignature.html
 solr/docs/solr-core/org/apache/solr/update/processor/TimestampUpdateProcessorFactory.html
 solr/docs/solr-core/org/apache/solr/update/processor/TolerantUpdateProcessor.html
@@ -2694,6 +2716,8 @@ solr/docs/solr-core/org/apache/solr/update/processor/class-use/Signature.html
 solr/docs/solr-core/org/apache/solr/update/processor/class-use/SignatureUpdateProcessorFactory.html
 solr/docs/solr-core/org/apache/solr/update/processor/class-use/SimpleUpdateProcessorFactory.html
 solr/docs/solr-core/org/apache/solr/update/processor/class-use/StatelessScriptUpdateProcessorFactory.html
+solr/docs/solr-core/org/apache/solr/update/processor/class-use/TemplateUpdateProcessorFactory.Resolved.html
+solr/docs/solr-core/org/apache/solr/update/processor/class-use/TemplateUpdateProcessorFactory.html
 solr/docs/solr-core/org/apache/solr/update/processor/class-use/TextProfileSignature.html
 solr/docs/solr-core/org/apache/solr/update/processor/class-use/TimestampUpdateProcessorFactory.html
 solr/docs/solr-core/org/apache/solr/update/processor/class-use/TolerantUpdateProcessor.html
@@ -2754,6 +2778,7 @@ solr/docs/solr-core/org/apache/solr/util/SimplePostTool.BAOS.html
 solr/docs/solr-core/org/apache/solr/util/SimplePostTool.PageFetcherResult.html
 solr/docs/solr-core/org/apache/solr/util/SimplePostTool.html
 solr/docs/solr-core/org/apache/solr/util/SolrCLI.ApiTool.html
+solr/docs/solr-core/org/apache/solr/util/SolrCLI.AssertTool.html
 solr/docs/solr-core/org/apache/solr/util/SolrCLI.ConfigSetDownloadTool.html
 solr/docs/solr-core/org/apache/solr/util/SolrCLI.ConfigSetUploadTool.html
 solr/docs/solr-core/org/apache/solr/util/SolrCLI.ConfigTool.html
@@ -2767,6 +2792,7 @@ solr/docs/solr-core/org/apache/solr/util/SolrCLI.SolrCloudTool.html
 solr/docs/solr-core/org/apache/solr/util/SolrCLI.StatusTool.html
 solr/docs/solr-core/org/apache/solr/util/SolrCLI.Tool.html
 solr/docs/solr-core/org/apache/solr/util/SolrCLI.ToolBase.html
+solr/docs/solr-core/org/apache/solr/util/SolrCLI.UtilsTool.html
 solr/docs/solr-core/org/apache/solr/util/SolrCLI.ZkCpTool.html
 solr/docs/solr-core/org/apache/solr/util/SolrCLI.ZkLsTool.html
 solr/docs/solr-core/org/apache/solr/util/SolrCLI.ZkMvTool.html
@@ -2828,6 +2854,7 @@ solr/docs/solr-core/org/apache/solr/util/class-use/SimplePostTool.BAOS.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SimplePostTool.PageFetcherResult.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SimplePostTool.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ApiTool.html
+solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.AssertTool.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ConfigSetDownloadTool.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ConfigSetUploadTool.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ConfigTool.html
@@ -2841,6 +2868,7 @@ solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.SolrCloudTool.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.StatusTool.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.Tool.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ToolBase.html
+solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.UtilsTool.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ZkCpTool.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ZkLsTool.html
 solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ZkMvTool.html
@@ -3339,6 +3367,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/CloudSolrClient.RouteResp
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/CloudSolrClient.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.Builder.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/DelegationTokenHttpSolrClient.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/HttpClientConfigurer.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/HttpClientUtil.HttpClientFactory.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/HttpClientUtil.html
@@ -3369,6 +3398,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/CloudSolrClient
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/CloudSolrClient.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/ConcurrentUpdateSolrClient.Builder.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/ConcurrentUpdateSolrClient.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/DelegationTokenHttpSolrClient.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/HttpClientConfigurer.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/HttpClientUtil.HttpClientFactory.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/HttpClientUtil.html
@@ -3396,9 +3426,11 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/package-summary.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/package-tree.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/package-use.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ClassificationEvaluation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ModelCache.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/SolrClientCache.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/Tuple.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/class-use/ClassificationEvaluation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/class-use/ModelCache.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/class-use/SolrClientCache.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/class-use/Tuple.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/comp/ComparatorLambda.html
@@ -3477,12 +3509,16 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/BiJoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/CloudSolrStream.StreamOpener.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/CloudSolrStream.TupleWrapper.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/CloudSolrStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/CommitStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ComplementStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/DaemonStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ExceptionStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ExecutorStream.StreamTask.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ExecutorStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/FacetStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.FeaturesSelectionCall.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/FetchStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/HashJoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/InnerJoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/IntersectStream.html
@@ -3491,6 +3527,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/JSONTupleStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/JoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/MergeStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ModelStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ParallelStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/PushBackStream.html
@@ -3516,12 +3553,16 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/BiJoinStre
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/CloudSolrStream.StreamOpener.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/CloudSolrStream.TupleWrapper.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/CloudSolrStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/CommitStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ComplementStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/DaemonStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ExceptionStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ExecutorStream.StreamTask.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ExecutorStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/FacetStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/FeaturesSelectionStream.FeaturesSelectionCall.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/FeaturesSelectionStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/FetchStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/HashJoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/InnerJoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/IntersectStream.html
@@ -3530,6 +3571,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/JSONTupleS
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/JoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/LeftOuterJoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/MergeStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ModelStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/OuterHashJoinStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ParallelStream.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/PushBackStream.html
@@ -3617,15 +3659,18 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.Create.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.CreateAlias.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.CreateShard.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.CreateSnapshot.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.Delete.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteAlias.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteNode.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteReplica.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteReplicaProp.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteShard.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteSnapshot.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteStatus.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.ForceLeader.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.List.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.ListSnapshots.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.Migrate.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.MigrateClusterState.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.OverseerStatus.html
@@ -3656,6 +3701,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.Reque
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.Unload.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.WaitForState.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CoreStatus.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/DelegationTokenRequest.Cancel.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/DelegationTokenRequest.Get.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/DelegationTokenRequest.Renew.html
@@ -3689,15 +3735,18 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAd
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.Create.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.CreateAlias.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.CreateShard.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.CreateSnapshot.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.Delete.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteAlias.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteNode.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteReplica.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteReplicaProp.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteShard.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteSnapshot.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteStatus.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.ForceLeader.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.List.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.ListSnapshots.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.Migrate.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.MigrateClusterState.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.OverseerStatus.html
@@ -3728,6 +3777,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CoreAdminReq
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CoreAdminRequest.Unload.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CoreAdminRequest.WaitForState.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CoreAdminRequest.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CoreStatus.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/DelegationTokenRequest.Cancel.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/DelegationTokenRequest.Get.html
 solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/DelegationTokenRequest.Renew.html
@@ -3962,6 +4012,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/util/package-use.html
 solr/docs/solr-solrj/org/apache/solr/common/Callable.html
 solr/docs/solr-solrj/org/apache/solr/common/EmptyEntityResolver.html
 solr/docs/solr-solrj/org/apache/solr/common/EnumFieldValue.html
+solr/docs/solr-solrj/org/apache/solr/common/MapSerializable.html
 solr/docs/solr-solrj/org/apache/solr/common/NonExistentCoreException.html
 solr/docs/solr-solrj/org/apache/solr/common/SolrDocument.html
 solr/docs/solr-solrj/org/apache/solr/common/SolrDocumentBase.html
@@ -3976,6 +4027,7 @@ solr/docs/solr-solrj/org/apache/solr/common/ToleratedUpdateError.html
 solr/docs/solr-solrj/org/apache/solr/common/class-use/Callable.html
 solr/docs/solr-solrj/org/apache/solr/common/class-use/EmptyEntityResolver.html
 solr/docs/solr-solrj/org/apache/solr/common/class-use/EnumFieldValue.html
+solr/docs/solr-solrj/org/apache/solr/common/class-use/MapSerializable.html
 solr/docs/solr-solrj/org/apache/solr/common/class-use/NonExistentCoreException.html
 solr/docs/solr-solrj/org/apache/solr/common/class-use/SolrDocument.html
 solr/docs/solr-solrj/org/apache/solr/common/class-use/SolrDocumentBase.html
@@ -4089,6 +4141,20 @@ solr/docs/solr-solrj/org/apache/solr/common/cloud/package-frame.html
 solr/docs/solr-solrj/org/apache/solr/common/cloud/package-summary.html
 solr/docs/solr-solrj/org/apache/solr/common/cloud/package-tree.html
 solr/docs/solr-solrj/org/apache/solr/common/cloud/package-use.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/ImplicitSnitch.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/RemoteCallback.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/Snitch.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/SnitchContext.SnitchInfo.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/SnitchContext.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/class-use/ImplicitSnitch.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/class-use/RemoteCallback.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/class-use/Snitch.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/class-use/SnitchContext.SnitchInfo.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/class-use/SnitchContext.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/package-frame.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/package-summary.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/package-tree.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/package-use.html
 solr/docs/solr-solrj/org/apache/solr/common/luke/FieldFlag.html
 solr/docs/solr-solrj/org/apache/solr/common/luke/class-use/FieldFlag.html
 solr/docs/solr-solrj/org/apache/solr/common/luke/package-frame.html
@@ -4210,6 +4276,7 @@ solr/docs/solr-solrj/org/apache/solr/common/util/JavaBinCodec.WritableDocFields.
 solr/docs/solr-solrj/org/apache/solr/common/util/JavaBinCodec.html
 solr/docs/solr-solrj/org/apache/solr/common/util/JsonRecordReader.Handler.html
 solr/docs/solr-solrj/org/apache/solr/common/util/JsonRecordReader.html
+solr/docs/solr-solrj/org/apache/solr/common/util/MapBackedCache.html
 solr/docs/solr-solrj/org/apache/solr/common/util/NamedList.NamedListEntry.html
 solr/docs/solr-solrj/org/apache/solr/common/util/NamedList.html
 solr/docs/solr-solrj/org/apache/solr/common/util/ObjectReleaseTracker.html
@@ -4250,6 +4317,7 @@ solr/docs/solr-solrj/org/apache/solr/common/util/class-use/JavaBinCodec.Writable
 solr/docs/solr-solrj/org/apache/solr/common/util/class-use/JavaBinCodec.html
 solr/docs/solr-solrj/org/apache/solr/common/util/class-use/JsonRecordReader.Handler.html
 solr/docs/solr-solrj/org/apache/solr/common/util/class-use/JsonRecordReader.html
+solr/docs/solr-solrj/org/apache/solr/common/util/class-use/MapBackedCache.html
 solr/docs/solr-solrj/org/apache/solr/common/util/class-use/NamedList.NamedListEntry.html
 solr/docs/solr-solrj/org/apache/solr/common/util/class-use/NamedList.html
 solr/docs/solr-solrj/org/apache/solr/common/util/class-use/ObjectReleaseTracker.html
@@ -4432,6 +4500,8 @@ solr/docs/solr-test-framework/org/apache/solr/util/BadZookeeperThreadsFilter.htm
 solr/docs/solr-test-framework/org/apache/solr/util/BaseTestHarness.html
 solr/docs/solr-test-framework/org/apache/solr/util/DOMUtilTestBase.html
 solr/docs/solr-test-framework/org/apache/solr/util/ExternalPaths.html
+solr/docs/solr-test-framework/org/apache/solr/util/LogLevel.Configurer.html
+solr/docs/solr-test-framework/org/apache/solr/util/LogLevel.html
 solr/docs/solr-test-framework/org/apache/solr/util/RESTfulServerProvider.html
 solr/docs/solr-test-framework/org/apache/solr/util/RandomForceMergePolicy.html
 solr/docs/solr-test-framework/org/apache/solr/util/RandomForceMergePolicyFactory.html
@@ -4454,6 +4524,8 @@ solr/docs/solr-test-framework/org/apache/solr/util/class-use/BadZookeeperThreads
 solr/docs/solr-test-framework/org/apache/solr/util/class-use/BaseTestHarness.html
 solr/docs/solr-test-framework/org/apache/solr/util/class-use/DOMUtilTestBase.html
 solr/docs/solr-test-framework/org/apache/solr/util/class-use/ExternalPaths.html
+solr/docs/solr-test-framework/org/apache/solr/util/class-use/LogLevel.Configurer.html
+solr/docs/solr-test-framework/org/apache/solr/util/class-use/LogLevel.html
 solr/docs/solr-test-framework/org/apache/solr/util/class-use/RESTfulServerProvider.html
 solr/docs/solr-test-framework/org/apache/solr/util/class-use/RandomForceMergePolicy.html
 solr/docs/solr-test-framework/org/apache/solr/util/class-use/RandomForceMergePolicyFactory.html
@@ -5274,7 +5346,7 @@ solr/licenses/javax.servlet-api-NOTICE.txt
 solr/licenses/jaxb-impl-2.2.3-1.jar.sha1
 solr/licenses/jaxb-impl-LICENSE-CDDL.txt
 solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1
-solr/licenses/jcl-over-slf4j-LICENSE-BSD_LIKE.txt
+solr/licenses/jcl-over-slf4j-LICENSE-MIT.txt
 solr/licenses/jcl-over-slf4j-NOTICE.txt
 solr/licenses/jdom-1.0.jar.sha1
 solr/licenses/jdom-LICENSE-BSD_LIKE.txt
@@ -5319,12 +5391,12 @@ solr/licenses/jsonic-1.2.7.jar.sha1
 solr/licenses/jsonic-LICENSE-ASL.txt
 solr/licenses/jsonic-NOTICE.txt
 solr/licenses/jul-to-slf4j-1.7.7.jar.sha1
-solr/licenses/jul-to-slf4j-LICENSE-BSD_LIKE.txt
+solr/licenses/jul-to-slf4j-LICENSE-MIT.txt
 solr/licenses/jul-to-slf4j-NOTICE.txt
 solr/licenses/junit-4.10.jar.sha1
 solr/licenses/junit-LICENSE-CPL.txt
 solr/licenses/junit-NOTICE.txt
-solr/licenses/junit4-ant-2.3.4.jar.sha1
+solr/licenses/junit4-ant-2.4.0.jar.sha1
 solr/licenses/junit4-ant-LICENSE-ASL.txt
 solr/licenses/junit4-ant-NOTICE.txt
 solr/licenses/juniversalchardet-1.0.3.jar.sha1
@@ -5370,7 +5442,6 @@ solr/licenses/leveldbjni-NOTICE.txt
 solr/licenses/log4j-1.2.17.jar.sha1
 solr/licenses/log4j-LICENSE-ASL.txt
 solr/licenses/log4j-NOTICE.txt
-solr/licenses/mail-LICENSE-CDDL.txt
 solr/licenses/metadata-extractor-2.8.1.jar.sha1
 solr/licenses/metadata-extractor-LICENSE-PD.txt
 solr/licenses/metrics-core-3.0.1.jar.sha1
@@ -5384,13 +5455,13 @@ solr/licenses/mina-core-LICENSE-ASL.txt
 solr/licenses/mina-core-NOTICE.txt
 solr/licenses/mockito-core-1.9.5.jar.sha1
 solr/licenses/mockito-core-LICENSE-MIT.txt
-solr/licenses/morfologik-fsa-2.1.0.jar.sha1
+solr/licenses/morfologik-fsa-2.1.1.jar.sha1
 solr/licenses/morfologik-fsa-LICENSE-BSD.txt
 solr/licenses/morfologik-fsa-NOTICE.txt
-solr/licenses/morfologik-polish-2.1.0.jar.sha1
+solr/licenses/morfologik-polish-2.1.1.jar.sha1
 solr/licenses/morfologik-polish-LICENSE-BSD.txt
 solr/licenses/morfologik-polish-NOTICE.txt
-solr/licenses/morfologik-stemming-2.1.0.jar.sha1
+solr/licenses/morfologik-stemming-2.1.1.jar.sha1
 solr/licenses/morfologik-stemming-LICENSE-BSD.txt
 solr/licenses/morfologik-stemming-NOTICE.txt
 solr/licenses/mrunit-1.0.0-hadoop2.jar.sha1
@@ -5441,7 +5512,7 @@ solr/licenses/presto-parser-NOTICE.txt
 solr/licenses/protobuf-java-2.5.0.jar.sha1
 solr/licenses/protobuf-java-LICENSE-BSD.txt
 solr/licenses/protobuf-java-NOTICE.txt
-solr/licenses/randomizedtesting-runner-2.3.4.jar.sha1
+solr/licenses/randomizedtesting-runner-2.4.0.jar.sha1
 solr/licenses/randomizedtesting-runner-LICENSE-ASL.txt
 solr/licenses/randomizedtesting-runner-NOTICE.txt
 solr/licenses/rome-1.0.jar.sha1
@@ -5453,7 +5524,7 @@ solr/licenses/servlet-api-NOTICE.txt
 solr/licenses/simple-xml-2.7.1.jar.sha1
 solr/licenses/simple-xml-LICENSE-ASL.txt
 solr/licenses/simple-xml-NOTICE.txt
-solr/licenses/slf4j-LICENSE-BSD_LIKE.txt
+solr/licenses/slf4j-LICENSE-MIT.txt
 solr/licenses/slf4j-NOTICE.txt
 solr/licenses/slf4j-api-1.7.7.jar.sha1
 solr/licenses/slf4j-log4j12-1.7.7.jar.sha1
@@ -5553,6 +5624,7 @@ solr/server/modules/server.mod
 solr/server/modules/ssl.mod
 solr/server/resources/jetty-logging.properties
 solr/server/resources/log4j.properties
+solr/server/resources/log4j.properties.bak
 solr/server/scripts/cloud-scripts/log4j.properties
 solr/server/scripts/cloud-scripts/zkcli.bat
 solr/server/scripts/cloud-scripts/zkcli.sh
@@ -5583,10 +5655,10 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/htrace-core-3.2.0-incubating.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/httpclient-4.4.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/httpcore-4.4.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/httpmime-4.4.1.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.5.4.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.5.4.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.5.4.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-asl-1.9.13.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.5.4.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/joda-time-2.2.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-%%PORTVERSION%%.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-%%PORTVERSION%%.jar
@@ -6131,6 +6203,7 @@ solr/server/solr/configsets/sample_techproducts_configs/conf/lang/userdict_ja.tx
 solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
 solr/server/solr/configsets/sample_techproducts_configs/conf/mapping-FoldToASCII.txt
 solr/server/solr/configsets/sample_techproducts_configs/conf/mapping-ISOLatin1Accent.txt
+solr/server/solr/configsets/sample_techproducts_configs/conf/params.json
 solr/server/solr/configsets/sample_techproducts_configs/conf/protwords.txt
 solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
 solr/server/solr/configsets/sample_techproducts_configs/conf/spellings.txt
@@ -6181,6 +6254,7 @@ solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xsl
 solr/server/solr/solr.xml
 solr/server/solr/zoo.cfg
 solr/server/start.jar
+@dir solr/example/lib/ext
+@dir solr/server/logs
 @dir /var/db/solr
 @dir /var/log/solr
-