6 files changed, 212 insertions, 151 deletions

diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index c2d9de7a1ba8..f8380485589a 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	apache-solr
-PORTVERSION=	7.1.0
+PORTVERSION=	7.4.0
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/lucene/solr/${PORTVERSION}
 DISTNAME=	solr-${PORTVERSION}
@@ -31,9 +31,6 @@ GROUPS=		${USERS}
 CPE_PRODUCT=	solr
 CPE_VENDOR=	apache
 
-post-patch:
-	${REINPLACE_CMD} -e 's|solr.log=.*|solr.log=/var/log/solr|g' ${WRKSRC}/server/resources/log4j.properties
-
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/solr ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin
@@ -48,6 +45,5 @@ do-install:
 	${MKDIR} ${STAGEDIR}/var/db/solr
 	${MKDIR} ${STAGEDIR}/var/log/solr
 	${INSTALL_DATA} ${WRKSRC}/server/solr/solr.xml ${STAGEDIR}/var/db/solr/solr.xml-dist
-	${INSTALL_DATA} ${WRKSRC}/server/resources/log4j.properties ${STAGEDIR}/var/db/solr/log4j.properties-dist
 
 .include <bsd.port.mk>
diff --git a/textproc/apache-solr/distinfo b/textproc/apache-solr/distinfo
index acaa795d77e7..a6d6c0b721d0 100644
--- a/textproc/apache-solr/distinfo
+++ b/textproc/apache-solr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508238386
-SHA256 (solr-7.1.0.tgz) = 5cd25cc2634e47efbb529658d6ddd406a7cd1b211affa26563a28db2d80b8133
-SIZE (solr-7.1.0.tgz) = 152481397
+TIMESTAMP = 1537608749
+SHA256 (solr-7.4.0.tgz) = a50eac8dece0acb5e6f0d868c7868ce8174e299752356f3424a15aa39bd64407
+SIZE (solr-7.4.0.tgz) = 167346886
diff --git a/textproc/apache-solr/files/pkg-message.in b/textproc/apache-solr/files/pkg-message.in
index f0f919a1a3bf..09069202003c 100644
--- a/textproc/apache-solr/files/pkg-message.in
+++ b/textproc/apache-solr/files/pkg-message.in
@@ -4,7 +4,6 @@ Make sure to edit the following files to adapt to your setup:
 
 %%LOCALBASE%%/etc/solr.in.sh
 /var/db/solr/solr.xml
-/var/db/solr/log4j.properties
 
 All files are configured to have your solr instances running in
 /var/db/solr/<instancename>
@@ -17,7 +16,7 @@ The port is configured to listen only on localhost, port 8983.
 To have a working initial config, use:
 
 cp -R %%LOCALBASE%%/solr/example/example-DIH/solr/solr /var/db/solr/
-chown -R www /var/db/solr/solr
+chown -R solr /var/db/solr/solr
 
 To rotate solr log files include /var/log/solr/ to your log rotation
 configuration.
diff --git a/textproc/apache-solr/files/solr.in b/textproc/apache-solr/files/solr.in
index 7de46d35c5d8..7f574934c481 100644
--- a/textproc/apache-solr/files/solr.in
+++ b/textproc/apache-solr/files/solr.in
@@ -59,7 +59,7 @@ export PATH=$PATH:%%LOCALBASE%%/bin
 # let the start script read some custom settings
 export SOLR_INCLUDE=/usr/local/etc/solr.in.sh
 
-required_files="${solr_instance}/solr.xml /usr/local/etc/solr.in.sh ${solr_instance}/log4j.properties"
+required_files="${solr_instance}/solr.xml /usr/local/etc/solr.in.sh"
 command=%%PREFIX%%/solr/bin/solr
 start_cmd=solr_start
 stop_cmd=solr_stop
diff --git a/textproc/apache-solr/pkg-descr b/textproc/apache-solr/pkg-descr
index 768e7aea9f37..f6dbe3f26cdf 100644
--- a/textproc/apache-solr/pkg-descr
+++ b/textproc/apache-solr/pkg-descr
@@ -4,4 +4,4 @@ faceted search, caching, replication, a web administration interface
 and many more features. It runs in a Java servlet container such as
 Tomcat.
 
-WWW: http://lucene.apache.org/solr/
+WWW: https://lucene.apache.org/solr/
diff --git a/textproc/apache-solr/pkg-plist b/textproc/apache-solr/pkg-plist
index 23265a774a99..7824536f0670 100644
--- a/textproc/apache-solr/pkg-plist
+++ b/textproc/apache-solr/pkg-plist
@@ -1,6 +1,5 @@
 @sample etc/solr.in.sh-dist etc/solr.in.sh
 @sample(solr,solr) /var/db/solr/solr.xml-dist /var/db/solr/solr.xml
-@sample(solr,solr) /var/db/solr/log4j.properties-dist /var/db/solr/log4j.properties
 solr/CHANGES.txt
 solr/LICENSE.txt
 solr/LUCENE_CHANGES.txt
@@ -15,67 +14,93 @@ solr/bin/solr.cmd
 solr/bin/solr.in.cmd
 solr/bin/solr.in.sh
 solr/contrib/analysis-extras/README.txt
-solr/contrib/analysis-extras/lib/icu4j-59.1.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/lib/icu4j-61.1.jar
+solr/contrib/analysis-extras/lib/morfologik-fsa-2.1.5.jar
+solr/contrib/analysis-extras/lib/morfologik-polish-2.1.5.jar
+solr/contrib/analysis-extras/lib/morfologik-stemming-2.1.5.jar
+solr/contrib/analysis-extras/lib/opennlp-maxent-3.0.3.jar
+solr/contrib/analysis-extras/lib/opennlp-tools-1.8.3.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-opennlp-%%PORTVERSION%%.jar
 solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-%%PORTVERSION%%.jar
 solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-%%PORTVERSION%%.jar
 solr/contrib/clustering/README.txt
-solr/contrib/clustering/lib/attributes-binder-1.3.1.jar
+solr/contrib/clustering/lib/attributes-binder-1.3.3.jar
 solr/contrib/clustering/lib/carrot2-guava-18.0.jar
-solr/contrib/clustering/lib/carrot2-mini-3.15.0.jar
-solr/contrib/clustering/lib/jackson-annotations-2.5.4.jar
-solr/contrib/clustering/lib/jackson-databind-2.5.4.jar
+solr/contrib/clustering/lib/carrot2-mini-3.16.0.jar
+solr/contrib/clustering/lib/jackson-annotations-2.9.5.jar
+solr/contrib/clustering/lib/jackson-databind-2.9.5.jar
 solr/contrib/clustering/lib/simple-xml-2.7.1.jar
 solr/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar
 solr/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar
 solr/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar
 solr/contrib/dataimporthandler/README.txt
 solr/contrib/extraction/README.txt
-solr/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar
-solr/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar
+solr/contrib/extraction/lib/apache-mime4j-core-0.8.1.jar
+solr/contrib/extraction/lib/apache-mime4j-dom-0.8.1.jar
 solr/contrib/extraction/lib/aspectjrt-1.8.0.jar
-solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar
-solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar
+solr/contrib/extraction/lib/bcmail-jdk15on-1.54.jar
+solr/contrib/extraction/lib/bcpkix-jdk15on-1.54.jar
+solr/contrib/extraction/lib/bcprov-jdk15on-1.54.jar
 solr/contrib/extraction/lib/boilerpipe-1.1.0.jar
 solr/contrib/extraction/lib/commons-collections4-4.1.jar
 solr/contrib/extraction/lib/commons-compress-1.14.jar
 solr/contrib/extraction/lib/curvesapi-1.04.jar
-solr/contrib/extraction/lib/fontbox-2.0.6.jar
-solr/contrib/extraction/lib/icu4j-59.1.jar
+solr/contrib/extraction/lib/fontbox-2.0.8.jar
+solr/contrib/extraction/lib/icu4j-61.1.jar
 solr/contrib/extraction/lib/isoparser-1.1.18.jar
 solr/contrib/extraction/lib/jackcess-2.1.8.jar
+solr/contrib/extraction/lib/jackcess-encrypt-2.1.4.jar
 solr/contrib/extraction/lib/java-libpst-0.8.1.jar
-solr/contrib/extraction/lib/jdom-1.0.jar
+solr/contrib/extraction/lib/jdom-2.0.2.jar
 solr/contrib/extraction/lib/jempbox-1.8.13.jar
 solr/contrib/extraction/lib/jmatio-1.2.jar
 solr/contrib/extraction/lib/juniversalchardet-1.0.3.jar
-solr/contrib/extraction/lib/metadata-extractor-2.9.1.jar
-solr/contrib/extraction/lib/pdfbox-2.0.6.jar
-solr/contrib/extraction/lib/pdfbox-tools-2.0.6.jar
-solr/contrib/extraction/lib/poi-3.17-beta1.jar
-solr/contrib/extraction/lib/poi-ooxml-3.17-beta1.jar
-solr/contrib/extraction/lib/poi-ooxml-schemas-3.17-beta1.jar
-solr/contrib/extraction/lib/poi-scratchpad-3.17-beta1.jar
+solr/contrib/extraction/lib/metadata-extractor-2.10.1.jar
+solr/contrib/extraction/lib/pdfbox-2.0.8.jar
+solr/contrib/extraction/lib/pdfbox-tools-2.0.8.jar
+solr/contrib/extraction/lib/poi-3.17.jar
+solr/contrib/extraction/lib/poi-ooxml-3.17.jar
+solr/contrib/extraction/lib/poi-ooxml-schemas-3.17.jar
+solr/contrib/extraction/lib/poi-scratchpad-3.17.jar
 solr/contrib/extraction/lib/rome-1.5.1.jar
+solr/contrib/extraction/lib/rome-utils-1.5.1.jar
 solr/contrib/extraction/lib/tagsoup-1.2.1.jar
-solr/contrib/extraction/lib/tika-core-1.16.jar
-solr/contrib/extraction/lib/tika-java7-1.16.jar
-solr/contrib/extraction/lib/tika-parsers-1.16.jar
-solr/contrib/extraction/lib/tika-xmp-1.16.jar
+solr/contrib/extraction/lib/tika-core-1.17.jar
+solr/contrib/extraction/lib/tika-java7-1.17.jar
+solr/contrib/extraction/lib/tika-parsers-1.17.jar
+solr/contrib/extraction/lib/tika-xmp-1.17.jar
 solr/contrib/extraction/lib/vorbis-java-core-0.8.jar
 solr/contrib/extraction/lib/vorbis-java-tika-0.8.jar
 solr/contrib/extraction/lib/xercesImpl-2.9.1.jar
 solr/contrib/extraction/lib/xmlbeans-2.6.0.jar
-solr/contrib/extraction/lib/xmpcore-5.1.2.jar
+solr/contrib/extraction/lib/xmpcore-5.1.3.jar
 solr/contrib/extraction/lib/xz-1.6.jar
 solr/contrib/langid/README.txt
 solr/contrib/langid/lib/jsonic-1.2.7.jar
 solr/contrib/langid/lib/langdetect-1.1-20120112.jar
+solr/contrib/langid/lib/opennlp-tools-1.8.3.jar
 solr/contrib/ltr/README.txt
+solr/contrib/prometheus-exporter/README.txt
+solr/contrib/prometheus-exporter/bin/solr-exporter
+solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
+solr/contrib/prometheus-exporter/conf/grafana-solr-dashboard.json
+solr/contrib/prometheus-exporter/conf/log4j2.xml
+solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml
+solr/contrib/prometheus-exporter/lib/argparse4j-0.8.1.jar
+solr/contrib/prometheus-exporter/lib/jackson-annotations-2.9.5.jar
+solr/contrib/prometheus-exporter/lib/jackson-core-2.9.5.jar
+solr/contrib/prometheus-exporter/lib/jackson-databind-2.9.5.jar
+solr/contrib/prometheus-exporter/lib/jackson-jq-0.0.8.jar
+solr/contrib/prometheus-exporter/lib/log4j-api-2.11.0.jar
+solr/contrib/prometheus-exporter/lib/log4j-core-2.11.0.jar
+solr/contrib/prometheus-exporter/lib/log4j-slf4j-impl-2.11.0.jar
+solr/contrib/prometheus-exporter/lib/simpleclient-0.2.0.jar
+solr/contrib/prometheus-exporter/lib/simpleclient_common-0.2.0.jar
+solr/contrib/prometheus-exporter/lib/simpleclient_httpserver-0.2.0.jar
+solr/contrib/prometheus-exporter/lib/slf4j-api-1.7.24.jar
+solr/contrib/prometheus-exporter/lucene-libs/lucene-analyzers-common-%%PORTVERSION%%.jar
 solr/contrib/uima/README.txt
 solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar
 solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar
@@ -97,6 +122,7 @@ solr/dist/solr-dataimporthandler-%%PORTVERSION%%.jar
 solr/dist/solr-dataimporthandler-extras-%%PORTVERSION%%.jar
 solr/dist/solr-langid-%%PORTVERSION%%.jar
 solr/dist/solr-ltr-%%PORTVERSION%%.jar
+solr/dist/solr-prometheus-exporter-%%PORTVERSION%%.jar
 solr/dist/solr-solrj-%%PORTVERSION%%.jar
 solr/dist/solr-test-framework-%%PORTVERSION%%.jar
 solr/dist/solr-uima-%%PORTVERSION%%.jar
@@ -106,17 +132,17 @@ solr/dist/solrj-lib/commons-math3-3.6.1.jar
 solr/dist/solrj-lib/httpclient-4.5.3.jar
 solr/dist/solrj-lib/httpcore-4.4.6.jar
 solr/dist/solrj-lib/httpmime-4.5.3.jar
-solr/dist/solrj-lib/jcl-over-slf4j-1.7.7.jar
+solr/dist/solrj-lib/jcl-over-slf4j-1.7.24.jar
 solr/dist/solrj-lib/noggit-0.8.jar
-solr/dist/solrj-lib/slf4j-api-1.7.7.jar
+solr/dist/solrj-lib/slf4j-api-1.7.24.jar
 solr/dist/solrj-lib/stax2-api-3.1.4.jar
 solr/dist/solrj-lib/woodstox-core-asl-4.4.1.jar
-solr/dist/solrj-lib/zookeeper-3.4.10.jar
+solr/dist/solrj-lib/zookeeper-3.4.11.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.5.3.jar
-solr/dist/test-framework/lib/randomizedtesting-runner-2.5.3.jar
+solr/dist/test-framework/lib/junit4-ant-2.6.0.jar
+solr/dist/test-framework/lib/randomizedtesting-runner-2.6.0.jar
 solr/dist/test-framework/lucene-libs/lucene-test-framework-%%PORTVERSION%%.jar
 solr/docs/images/solr.svg
 solr/docs/index.html
@@ -131,9 +157,6 @@ solr/example/example-DIH/solr/atom/conf/solrconfig.xml
 solr/example/example-DIH/solr/atom/conf/synonyms.txt
 solr/example/example-DIH/solr/atom/conf/url_types.txt
 solr/example/example-DIH/solr/atom/core.properties
-solr/example/example-DIH/solr/db/conf/admin-extra.html
-solr/example/example-DIH/solr/db/conf/admin-extra.menu-bottom.html
-solr/example/example-DIH/solr/db/conf/admin-extra.menu-top.html
 solr/example/example-DIH/solr/db/conf/clustering/carrot2/kmeans-attributes.xml
 solr/example/example-DIH/solr/db/conf/clustering/carrot2/lingo-attributes.xml
 solr/example/example-DIH/solr/db/conf/clustering/carrot2/stc-attributes.xml
@@ -196,9 +219,6 @@ solr/example/example-DIH/solr/db/conf/xslt/updateXml.xsl
 solr/example/example-DIH/solr/db/core.properties
 solr/example/example-DIH/solr/db/lib/derby-10.9.1.0.jar
 solr/example/example-DIH/solr/db/lib/hsqldb-2.4.0.jar
-solr/example/example-DIH/solr/mail/conf/admin-extra.html
-solr/example/example-DIH/solr/mail/conf/admin-extra.menu-bottom.html
-solr/example/example-DIH/solr/mail/conf/admin-extra.menu-top.html
 solr/example/example-DIH/solr/mail/conf/clustering/carrot2/kmeans-attributes.xml
 solr/example/example-DIH/solr/mail/conf/clustering/carrot2/lingo-attributes.xml
 solr/example/example-DIH/solr/mail/conf/clustering/carrot2/stc-attributes.xml
@@ -260,9 +280,6 @@ solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl
 solr/example/example-DIH/solr/mail/conf/xslt/updateXml.xsl
 solr/example/example-DIH/solr/mail/core.properties
 solr/example/example-DIH/solr/solr.xml
-solr/example/example-DIH/solr/solr/conf/admin-extra.html
-solr/example/example-DIH/solr/solr/conf/admin-extra.menu-bottom.html
-solr/example/example-DIH/solr/solr/conf/admin-extra.menu-top.html
 solr/example/example-DIH/solr/solr/conf/clustering/carrot2/kmeans-attributes.xml
 solr/example/example-DIH/solr/solr/conf/clustering/carrot2/lingo-attributes.xml
 solr/example/example-DIH/solr/solr/conf/clustering/carrot2/stc-attributes.xml
@@ -427,7 +444,7 @@ solr/example/films/films-LICENSE.txt
 solr/example/films/films.csv
 solr/example/films/films.json
 solr/example/films/films.xml
-solr/example/resources/log4j.properties
+solr/example/resources/log4j2.xml
 solr/licenses/AlchemyAPIAnnotator-2.3.1.jar.sha1
 solr/licenses/AlchemyAPIAnnotator-LICENSE-ASL.txt
 solr/licenses/AlchemyAPIAnnotator-NOTICE.txt
@@ -454,10 +471,10 @@ solr/licenses/antlr-NOTICE.txt
 solr/licenses/antlr4-runtime-4.5.1-1.jar.sha1
 solr/licenses/antlr4-runtime-LICENSE-BSD.txt
 solr/licenses/antlr4-runtime-NOTICE.txt
-solr/licenses/apache-mime4j-core-0.7.2.jar.sha1
+solr/licenses/apache-mime4j-core-0.8.1.jar.sha1
 solr/licenses/apache-mime4j-core-LICENSE-ASL.txt
 solr/licenses/apache-mime4j-core-NOTICE.txt
-solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1
+solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1
 solr/licenses/apache-mime4j-dom-LICENSE-ASL.txt
 solr/licenses/apache-mime4j-dom-NOTICE.txt
 solr/licenses/apacheds-core-2.0.0-M15.jar.sha1
@@ -550,6 +567,9 @@ solr/licenses/apacheds-xdbm-partition-NOTICE.txt
 solr/licenses/api-all-1.0.0-M20.jar.sha1
 solr/licenses/api-all-LICENSE-ASL.txt
 solr/licenses/api-all-NOTICE.txt
+solr/licenses/argparse4j-0.8.1.jar.sha1
+solr/licenses/argparse4j-LICENSE-MIT.txt
+solr/licenses/argparse4j-NOTICE.txt
 solr/licenses/asciidoctor-ant-1.6.0-alpha.5.jar.sha1
 solr/licenses/asciidoctor-ant-LICENSE-ASL.txt
 solr/licenses/asciidoctor-ant-NOTICE.txt
@@ -562,7 +582,7 @@ solr/licenses/asm-commons-LICENSE-BSD_LIKE.txt
 solr/licenses/asm-commons-NOTICE.txt
 solr/licenses/aspectjrt-1.8.0.jar.sha1
 solr/licenses/aspectjrt-LICENSE-EPL.txt
-solr/licenses/attributes-binder-1.3.1.jar.sha1
+solr/licenses/attributes-binder-1.3.3.jar.sha1
 solr/licenses/attributes-binder-LICENSE-ASL.txt
 solr/licenses/attributes-binder-NOTICE.txt
 solr/licenses/avatica-core-1.10.0.jar.sha1
@@ -570,10 +590,13 @@ solr/licenses/avatica-core-LICENSE-ASL.txt
 solr/licenses/avatica-core-NOTICE.txt
 solr/licenses/bcmail-LICENSE-BSD_LIKE.txt
 solr/licenses/bcmail-NOTICE.txt
-solr/licenses/bcmail-jdk15-1.45.jar.sha1
+solr/licenses/bcmail-jdk15on-1.54.jar.sha1
+solr/licenses/bcpkix-jdk15on-1.54.jar.sha1
+solr/licenses/bcpkix-jdk15on-LICENSE-BSD_LIKE.txt
+solr/licenses/bcpkix-jdk15on-NOTICE.txt
 solr/licenses/bcprov-LICENSE-BSD_LIKE.txt
 solr/licenses/bcprov-NOTICE.txt
-solr/licenses/bcprov-jdk15-1.45.jar.sha1
+solr/licenses/bcprov-jdk15on-1.54.jar.sha1
 solr/licenses/boilerpipe-1.1.0.jar.sha1
 solr/licenses/boilerpipe-LICENSE-ASL.txt
 solr/licenses/boilerpipe-NOTICE.txt
@@ -592,7 +615,7 @@ solr/licenses/calcite-linq4j-NOTICE.txt
 solr/licenses/carrot2-guava-18.0.jar.sha1
 solr/licenses/carrot2-guava-LICENSE-ASL.txt
 solr/licenses/carrot2-guava-NOTICE.txt
-solr/licenses/carrot2-mini-3.15.0.jar.sha1
+solr/licenses/carrot2-mini-3.16.0.jar.sha1
 solr/licenses/carrot2-mini-LICENSE-BSD_LIKE.txt
 solr/licenses/carrot2-mini-NOTICE.txt
 solr/licenses/commons-beanutils-1.8.3.jar.sha1
@@ -625,7 +648,7 @@ solr/licenses/commons-digester-NOTICE.txt
 solr/licenses/commons-exec-1.3.jar.sha1
 solr/licenses/commons-exec-LICENSE-ASL.txt
 solr/licenses/commons-exec-NOTICE.txt
-solr/licenses/commons-fileupload-1.3.2.jar.sha1
+solr/licenses/commons-fileupload-1.3.3.jar.sha1
 solr/licenses/commons-fileupload-LICENSE-ASL.txt
 solr/licenses/commons-fileupload-NOTICE.txt
 solr/licenses/commons-io-2.5.jar.sha1
@@ -655,6 +678,9 @@ solr/licenses/curvesapi-NOTICE.txt
 solr/licenses/derby-10.9.1.0.jar.sha1
 solr/licenses/derby-LICENSE-ASL.txt
 solr/licenses/derby-NOTICE.txt
+solr/licenses/disruptor-3.4.0.jar.sha1
+solr/licenses/disruptor-LICENSE-ASL.txt
+solr/licenses/disruptor-NOTICE.txt
 solr/licenses/dom4j-1.6.1.jar.sha1
 solr/licenses/dom4j-LICENSE-BSD_LIKE.txt
 solr/licenses/dom4j-NOTICE.txt
@@ -664,7 +690,7 @@ solr/licenses/ehcache-core-NOTICE.txt
 solr/licenses/eigenbase-properties-1.1.5.jar.sha1
 solr/licenses/eigenbase-properties-LICENSE-ASL.txt
 solr/licenses/eigenbase-properties-NOTICE.txt
-solr/licenses/fontbox-2.0.6.jar.sha1
+solr/licenses/fontbox-2.0.8.jar.sha1
 solr/licenses/fontbox-LICENSE-ASL.txt
 solr/licenses/fontbox-NOTICE.txt
 solr/licenses/gimap-1.5.1.jar.sha1
@@ -696,7 +722,7 @@ solr/licenses/hadoop-hdfs-tests-NOTICE.txt
 solr/licenses/hadoop-minikdc-2.7.4.jar.sha1
 solr/licenses/hadoop-minikdc-LICENSE-ASL.txt
 solr/licenses/hadoop-minikdc-NOTICE.txt
-solr/licenses/hppc-0.7.1.jar.sha1
+solr/licenses/hppc-0.8.1.jar.sha1
 solr/licenses/hppc-LICENSE-ASL.txt
 solr/licenses/hppc-NOTICE.txt
 solr/licenses/hsqldb-2.4.0.jar.sha1
@@ -714,7 +740,7 @@ solr/licenses/httpcore-NOTICE.txt
 solr/licenses/httpmime-4.5.3.jar.sha1
 solr/licenses/httpmime-LICENSE-ASL.txt
 solr/licenses/httpmime-NOTICE.txt
-solr/licenses/icu4j-59.1.jar.sha1
+solr/licenses/icu4j-61.1.jar.sha1
 solr/licenses/icu4j-LICENSE-BSD_LIKE.txt
 solr/licenses/icu4j-NOTICE.txt
 solr/licenses/isoparser-1.1.18.jar.sha1
@@ -723,21 +749,27 @@ solr/licenses/isoparser-NOTICE.txt
 solr/licenses/jackcess-2.1.8.jar.sha1
 solr/licenses/jackcess-LICENSE-ASL.txt
 solr/licenses/jackcess-NOTICE.txt
-solr/licenses/jackson-annotations-2.5.4.jar.sha1
+solr/licenses/jackcess-encrypt-2.1.4.jar.sha1
+solr/licenses/jackcess-encrypt-LICENSE-ASL.txt
+solr/licenses/jackcess-encrypt-NOTICE.txt
+solr/licenses/jackson-annotations-2.9.5.jar.sha1
 solr/licenses/jackson-annotations-LICENSE-ASL.txt
 solr/licenses/jackson-annotations-NOTICE.txt
-solr/licenses/jackson-core-2.5.4.jar.sha1
+solr/licenses/jackson-core-2.9.5.jar.sha1
 solr/licenses/jackson-core-LICENSE-ASL.txt
 solr/licenses/jackson-core-NOTICE.txt
 solr/licenses/jackson-core-asl-1.9.13.jar.sha1
 solr/licenses/jackson-core-asl-LICENSE-ASL.txt
 solr/licenses/jackson-core-asl-NOTICE.txt
-solr/licenses/jackson-databind-2.5.4.jar.sha1
+solr/licenses/jackson-databind-2.9.5.jar.sha1
 solr/licenses/jackson-databind-LICENSE-ASL.txt
 solr/licenses/jackson-databind-NOTICE.txt
-solr/licenses/jackson-dataformat-smile-2.5.4.jar.sha1
+solr/licenses/jackson-dataformat-smile-2.9.5.jar.sha1
 solr/licenses/jackson-dataformat-smile-LICENSE-ASL.txt
 solr/licenses/jackson-dataformat-smile-NOTICE.txt
+solr/licenses/jackson-jq-0.0.8.jar.sha1
+solr/licenses/jackson-jq-LICENSE-ASL.txt
+solr/licenses/jackson-jq-NOTICE.txt
 solr/licenses/jackson-mapper-asl-1.9.13.jar.sha1
 solr/licenses/jackson-mapper-asl-LICENSE-ASL.txt
 solr/licenses/jackson-mapper-asl-NOTICE.txt
@@ -752,10 +784,10 @@ solr/licenses/javax.mail-LICENSE-CDDL.txt
 solr/licenses/javax.servlet-api-3.1.0.jar.sha1
 solr/licenses/javax.servlet-api-LICENSE-CDDL.txt
 solr/licenses/javax.servlet-api-NOTICE.txt
-solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1
+solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1
 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-2.0.2.jar.sha1
 solr/licenses/jdom-LICENSE-BSD_LIKE.txt
 solr/licenses/jdom-NOTICE.txt
 solr/licenses/jempbox-1.8.13.jar.sha1
@@ -768,21 +800,21 @@ solr/licenses/jersey-server-LICENSE-CDDL.txt
 solr/licenses/jetty-6.1.26.jar.sha1
 solr/licenses/jetty-LICENSE-ASL.txt
 solr/licenses/jetty-NOTICE.txt
-solr/licenses/jetty-continuation-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-deploy-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-http-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-io-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-jmx-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-rewrite-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-security-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-server-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-servlet-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-servlets-9.3.20.v20170531.jar.sha1
+solr/licenses/jetty-continuation-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-deploy-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-http-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-io-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-jmx-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-rewrite-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-security-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-server-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-servlet-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-servlets-9.4.10.v20180503.jar.sha1
 solr/licenses/jetty-sslengine-6.1.26.jar.sha1
 solr/licenses/jetty-util-6.1.26.jar.sha1
-solr/licenses/jetty-util-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-webapp-9.3.20.v20170531.jar.sha1
-solr/licenses/jetty-xml-9.3.20.v20170531.jar.sha1
+solr/licenses/jetty-util-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-webapp-9.4.10.v20180503.jar.sha1
+solr/licenses/jetty-xml-9.4.10.v20180503.jar.sha1
 solr/licenses/jmatio-1.2.jar.sha1
 solr/licenses/jmatio-LICENSE-BSD.txt
 solr/licenses/jmatio-NOTICE.txt
@@ -794,13 +826,13 @@ solr/licenses/jsonic-LICENSE-ASL.txt
 solr/licenses/jsonic-NOTICE.txt
 solr/licenses/jsoup-1.8.2.jar.sha1
 solr/licenses/jsoup-LICENSE-MIT.txt
-solr/licenses/jul-to-slf4j-1.7.7.jar.sha1
+solr/licenses/jul-to-slf4j-1.7.24.jar.sha1
 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.5.3.jar.sha1
+solr/licenses/junit4-ant-2.6.0.jar.sha1
 solr/licenses/junit4-ant-LICENSE-ASL.txt
 solr/licenses/junit4-ant-NOTICE.txt
 solr/licenses/juniversalchardet-1.0.3.jar.sha1
@@ -809,26 +841,35 @@ solr/licenses/juniversalchardet-NOTICE.txt
 solr/licenses/langdetect-1.1-20120112.jar.sha1
 solr/licenses/langdetect-LICENSE-ASL.txt
 solr/licenses/langdetect-NOTICE.txt
-solr/licenses/log4j-1.2.17.jar.sha1
+solr/licenses/log4j-1.2-api-2.11.0.jar.sha1
 solr/licenses/log4j-LICENSE-ASL.txt
 solr/licenses/log4j-NOTICE.txt
-solr/licenses/metadata-extractor-2.9.1.jar.sha1
+solr/licenses/log4j-api-2.11.0.jar.sha1
+solr/licenses/log4j-api-LICENSE-ASL.txt
+solr/licenses/log4j-api-NOTICE.txt
+solr/licenses/log4j-core-2.11.0.jar.sha1
+solr/licenses/log4j-core-LICENSE-ASL.txt
+solr/licenses/log4j-core-NOTICE.txt
+solr/licenses/log4j-slf4j-LICENSE-ASL.txt
+solr/licenses/log4j-slf4j-NOTICE.txt
+solr/licenses/log4j-slf4j-impl-2.11.0.jar.sha1
+solr/licenses/metadata-extractor-2.10.1.jar.sha1
 solr/licenses/metadata-extractor-LICENSE-PD.txt
-solr/licenses/metrics-core-3.2.2.jar.sha1
+solr/licenses/metrics-core-3.2.6.jar.sha1
 solr/licenses/metrics-core-LICENSE-ASL.txt
 solr/licenses/metrics-core-NOTICE.txt
-solr/licenses/metrics-ganglia-3.2.2.jar.sha1
+solr/licenses/metrics-ganglia-3.2.6.jar.sha1
 solr/licenses/metrics-ganglia-LICENSE-ASL.txt
 solr/licenses/metrics-ganglia-NOTICE.txt
-solr/licenses/metrics-graphite-3.2.2.jar.sha1
+solr/licenses/metrics-graphite-3.2.6.jar.sha1
 solr/licenses/metrics-graphite-LICENSE-ASL.txt
 solr/licenses/metrics-graphite-NOTICE.txt
 solr/licenses/metrics-jetty-LICENSE-ASL.txt
 solr/licenses/metrics-jetty-NOTICE.txt
-solr/licenses/metrics-jetty9-3.2.2.jar.sha1
+solr/licenses/metrics-jetty9-3.2.6.jar.sha1
 solr/licenses/metrics-json-LICENSE-ASL.txt
 solr/licenses/metrics-json-NOTICE.txt
-solr/licenses/metrics-jvm-3.2.2.jar.sha1
+solr/licenses/metrics-jvm-3.2.6.jar.sha1
 solr/licenses/metrics-jvm-LICENSE-ASL.txt
 solr/licenses/metrics-jvm-NOTICE.txt
 solr/licenses/metrics-servlets-LICENSE-ASL.txt
@@ -838,13 +879,13 @@ solr/licenses/mina-core-LICENSE-ASL.txt
 solr/licenses/mina-core-NOTICE.txt
 solr/licenses/mockito-core-2.6.2.jar.sha1
 solr/licenses/mockito-core-LICENSE-MIT.txt
-solr/licenses/morfologik-fsa-2.1.1.jar.sha1
+solr/licenses/morfologik-fsa-2.1.5.jar.sha1
 solr/licenses/morfologik-fsa-LICENSE-BSD.txt
 solr/licenses/morfologik-fsa-NOTICE.txt
-solr/licenses/morfologik-polish-2.1.1.jar.sha1
+solr/licenses/morfologik-polish-2.1.5.jar.sha1
 solr/licenses/morfologik-polish-LICENSE-BSD.txt
 solr/licenses/morfologik-polish-NOTICE.txt
-solr/licenses/morfologik-stemming-2.1.1.jar.sha1
+solr/licenses/morfologik-stemming-2.1.5.jar.sha1
 solr/licenses/morfologik-stemming-LICENSE-BSD.txt
 solr/licenses/morfologik-stemming-NOTICE.txt
 solr/licenses/netty-all-4.0.36.Final.jar.sha1
@@ -856,28 +897,34 @@ solr/licenses/noggit-NOTICE.txt
 solr/licenses/objenesis-2.5.jar.sha1
 solr/licenses/objenesis-LICENSE-ASL.txt
 solr/licenses/objenesis-NOTICE.txt
+solr/licenses/opennlp-maxent-3.0.3.jar.sha1
+solr/licenses/opennlp-maxent-LICENSE-ASL.txt
+solr/licenses/opennlp-maxent-NOTICE.txt
+solr/licenses/opennlp-tools-1.8.3.jar.sha1
+solr/licenses/opennlp-tools-LICENSE-ASL.txt
+solr/licenses/opennlp-tools-NOTICE.txt
 solr/licenses/org.restlet-2.3.0.jar.sha1
 solr/licenses/org.restlet-LICENSE-ASL.txt
 solr/licenses/org.restlet-NOTICE.txt
 solr/licenses/org.restlet.ext.servlet-2.3.0.jar.sha1
 solr/licenses/org.restlet.ext.servlet-LICENSE-ASL.txt
 solr/licenses/org.restlet.ext.servlet-NOTICE.txt
-solr/licenses/pdfbox-2.0.6.jar.sha1
+solr/licenses/pdfbox-2.0.8.jar.sha1
 solr/licenses/pdfbox-LICENSE-ASL.txt
 solr/licenses/pdfbox-NOTICE.txt
-solr/licenses/pdfbox-tools-2.0.6.jar.sha1
+solr/licenses/pdfbox-tools-2.0.8.jar.sha1
 solr/licenses/pdfbox-tools-LICENSE-ASL.txt
 solr/licenses/pdfbox-tools-NOTICE.txt
-solr/licenses/poi-3.17-beta1.jar.sha1
+solr/licenses/poi-3.17.jar.sha1
 solr/licenses/poi-LICENSE-ASL.txt
 solr/licenses/poi-NOTICE.txt
-solr/licenses/poi-ooxml-3.17-beta1.jar.sha1
+solr/licenses/poi-ooxml-3.17.jar.sha1
 solr/licenses/poi-ooxml-LICENSE-ASL.txt
 solr/licenses/poi-ooxml-NOTICE.txt
-solr/licenses/poi-ooxml-schemas-3.17-beta1.jar.sha1
+solr/licenses/poi-ooxml-schemas-3.17.jar.sha1
 solr/licenses/poi-ooxml-schemas-LICENSE-ASL.txt
 solr/licenses/poi-ooxml-schemas-NOTICE.txt
-solr/licenses/poi-scratchpad-3.17-beta1.jar.sha1
+solr/licenses/poi-scratchpad-3.17.jar.sha1
 solr/licenses/poi-scratchpad-LICENSE-ASL.txt
 solr/licenses/poi-scratchpad-NOTICE.txt
 solr/licenses/presto-parser-LICENSE-ASL.txt
@@ -885,25 +932,39 @@ solr/licenses/presto-parser-NOTICE.txt
 solr/licenses/protobuf-java-3.1.0.jar.sha1
 solr/licenses/protobuf-java-LICENSE-BSD.txt
 solr/licenses/protobuf-java-NOTICE.txt
-solr/licenses/randomizedtesting-runner-2.5.3.jar.sha1
+solr/licenses/randomizedtesting-runner-2.6.0.jar.sha1
 solr/licenses/randomizedtesting-runner-LICENSE-ASL.txt
 solr/licenses/randomizedtesting-runner-NOTICE.txt
 solr/licenses/rome-1.5.1.jar.sha1
 solr/licenses/rome-LICENSE-ASL.txt
 solr/licenses/rome-NOTICE.txt
+solr/licenses/rome-utils-1.5.1.jar.sha1
+solr/licenses/rome-utils-LICENSE-ASL.txt
+solr/licenses/rome-utils-NOTICE.txt
+solr/licenses/rrd4j-3.2.jar.sha1
+solr/licenses/rrd4j-LICENSE-ASL.txt
+solr/licenses/rrd4j-NOTICE.txt
 solr/licenses/servlet-api-LICENSE-CDDL.txt
 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/simpleclient-0.2.0.jar.sha1
+solr/licenses/simpleclient-LICENSE-ASL.txt
+solr/licenses/simpleclient-NOTICE.txt
+solr/licenses/simpleclient_common-0.2.0.jar.sha1
+solr/licenses/simpleclient_common-LICENSE-ASL.txt
+solr/licenses/simpleclient_common-NOTICE.txt
+solr/licenses/simpleclient_httpserver-0.2.0.jar.sha1
+solr/licenses/simpleclient_httpserver-LICENSE-ASL.txt
+solr/licenses/simpleclient_httpserver-NOTICE.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
-solr/licenses/slf4j-simple-1.7.7.jar.sha1
+solr/licenses/slf4j-api-1.7.24.jar.sha1
+solr/licenses/slf4j-simple-1.7.24.jar.sha1
 solr/licenses/slice-LICENSE-ASL.txt
 solr/licenses/slice-NOTICE.txt
-solr/licenses/spatial4j-0.6.jar.sha1
+solr/licenses/spatial4j-0.7.jar.sha1
 solr/licenses/spatial4j-LICENSE-ASL.txt
 solr/licenses/spatial4j-NOTICE.txt
 solr/licenses/start.jar.sha1
@@ -916,16 +977,16 @@ solr/licenses/t-digest-NOTICE.txt
 solr/licenses/tagsoup-1.2.1.jar.sha1
 solr/licenses/tagsoup-LICENSE-ASL.txt
 solr/licenses/tagsoup-NOTICE.txt
-solr/licenses/tika-core-1.16.jar.sha1
+solr/licenses/tika-core-1.17.jar.sha1
 solr/licenses/tika-core-LICENSE-ASL.txt
 solr/licenses/tika-core-NOTICE.txt
-solr/licenses/tika-java7-1.16.jar.sha1
+solr/licenses/tika-java7-1.17.jar.sha1
 solr/licenses/tika-java7-LICENSE-ASL.txt
 solr/licenses/tika-java7-NOTICE.txt
-solr/licenses/tika-parsers-1.16.jar.sha1
+solr/licenses/tika-parsers-1.17.jar.sha1
 solr/licenses/tika-parsers-LICENSE-ASL.txt
 solr/licenses/tika-parsers-NOTICE.txt
-solr/licenses/tika-xmp-1.16.jar.sha1
+solr/licenses/tika-xmp-1.17.jar.sha1
 solr/licenses/tika-xmp-LICENSE-ASL.txt
 solr/licenses/tika-xmp-NOTICE.txt
 solr/licenses/uimaj-core-2.3.1.jar.sha1
@@ -952,13 +1013,13 @@ solr/licenses/xercesImpl-NOTICE.txt
 solr/licenses/xmlbeans-2.6.0.jar.sha1
 solr/licenses/xmlbeans-LICENSE-ASL.txt
 solr/licenses/xmlbeans-NOTICE.txt
-solr/licenses/xmpcore-5.1.2.jar.sha1
+solr/licenses/xmpcore-5.1.3.jar.sha1
 solr/licenses/xmpcore-LICENSE-BSD.txt
 solr/licenses/xmpcore-NOTICE.txt
 solr/licenses/xz-1.6.jar.sha1
 solr/licenses/xz-LICENSE-PD.txt
 solr/licenses/xz-NOTICE.txt
-solr/licenses/zookeeper-3.4.10.jar.sha1
+solr/licenses/zookeeper-3.4.11.jar.sha1
 solr/licenses/zookeeper-LICENSE-ASL.txt
 solr/licenses/zookeeper-NOTICE.txt
 solr/server/README.txt
@@ -968,39 +1029,41 @@ solr/server/etc/jetty-https.xml
 solr/server/etc/jetty-ssl.xml
 solr/server/etc/jetty.xml
 solr/server/etc/webdefault.xml
-solr/server/lib/ext/jcl-over-slf4j-1.7.7.jar
-solr/server/lib/ext/jul-to-slf4j-1.7.7.jar
-solr/server/lib/ext/log4j-1.2.17.jar
-solr/server/lib/ext/slf4j-api-1.7.7.jar
-solr/server/lib/ext/slf4j-log4j12-1.7.7.jar
+solr/server/lib/ext/disruptor-3.4.0.jar
+solr/server/lib/ext/jcl-over-slf4j-1.7.24.jar
+solr/server/lib/ext/jul-to-slf4j-1.7.24.jar
+solr/server/lib/ext/log4j-1.2-api-2.11.0.jar
+solr/server/lib/ext/log4j-api-2.11.0.jar
+solr/server/lib/ext/log4j-core-2.11.0.jar
+solr/server/lib/ext/log4j-slf4j-impl-2.11.0.jar
+solr/server/lib/ext/slf4j-api-1.7.24.jar
 solr/server/lib/gmetric4j-1.0.7.jar
 solr/server/lib/javax.servlet-api-3.1.0.jar
-solr/server/lib/jetty-continuation-9.3.20.v20170531.jar
-solr/server/lib/jetty-deploy-9.3.20.v20170531.jar
-solr/server/lib/jetty-http-9.3.20.v20170531.jar
-solr/server/lib/jetty-io-9.3.20.v20170531.jar
-solr/server/lib/jetty-jmx-9.3.20.v20170531.jar
-solr/server/lib/jetty-rewrite-9.3.20.v20170531.jar
-solr/server/lib/jetty-security-9.3.20.v20170531.jar
-solr/server/lib/jetty-server-9.3.20.v20170531.jar
-solr/server/lib/jetty-servlet-9.3.20.v20170531.jar
-solr/server/lib/jetty-servlets-9.3.20.v20170531.jar
-solr/server/lib/jetty-util-9.3.20.v20170531.jar
-solr/server/lib/jetty-webapp-9.3.20.v20170531.jar
-solr/server/lib/jetty-xml-9.3.20.v20170531.jar
-solr/server/lib/metrics-core-3.2.2.jar
-solr/server/lib/metrics-ganglia-3.2.2.jar
-solr/server/lib/metrics-graphite-3.2.2.jar
-solr/server/lib/metrics-jetty9-3.2.2.jar
-solr/server/lib/metrics-jvm-3.2.2.jar
+solr/server/lib/jetty-continuation-9.4.10.v20180503.jar
+solr/server/lib/jetty-deploy-9.4.10.v20180503.jar
+solr/server/lib/jetty-http-9.4.10.v20180503.jar
+solr/server/lib/jetty-io-9.4.10.v20180503.jar
+solr/server/lib/jetty-jmx-9.4.10.v20180503.jar
+solr/server/lib/jetty-rewrite-9.4.10.v20180503.jar
+solr/server/lib/jetty-security-9.4.10.v20180503.jar
+solr/server/lib/jetty-server-9.4.10.v20180503.jar
+solr/server/lib/jetty-servlet-9.4.10.v20180503.jar
+solr/server/lib/jetty-servlets-9.4.10.v20180503.jar
+solr/server/lib/jetty-util-9.4.10.v20180503.jar
+solr/server/lib/jetty-webapp-9.4.10.v20180503.jar
+solr/server/lib/jetty-xml-9.4.10.v20180503.jar
+solr/server/lib/metrics-core-3.2.6.jar
+solr/server/lib/metrics-ganglia-3.2.6.jar
+solr/server/lib/metrics-graphite-3.2.6.jar
+solr/server/lib/metrics-jetty9-3.2.6.jar
+solr/server/lib/metrics-jvm-3.2.6.jar
 solr/server/modules/http.mod
 solr/server/modules/https.mod
 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/resources/log4j2.xml
+solr/server/scripts/cloud-scripts/log4j2.xml
 solr/server/scripts/cloud-scripts/snapshotscli.sh
 solr/server/scripts/cloud-scripts/zkcli.bat
 solr/server/scripts/cloud-scripts/zkcli.sh
@@ -1017,7 +1080,7 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/commons-collections-3.2.2.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-compiler-2.7.6.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-configuration-1.6.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-exec-1.3.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/commons-fileupload-1.3.2.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/commons-fileupload-1.3.3.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-io-2.5.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-lang-2.6.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-lang3-3.6.jar
@@ -1025,6 +1088,7 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/commons-math3-3.6.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/curator-client-2.8.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/curator-framework-2.8.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/curator-recipes-2.8.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/disruptor-3.4.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/dom4j-1.6.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/eigenbase-properties-1.1.5.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/guava-14.0.1.jar
@@ -1032,16 +1096,16 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-annotations-2.7.4.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-auth-2.7.4.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-common-2.7.4.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-hdfs-2.7.4.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/hppc-0.7.1.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/hppc-0.8.1.jar
 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.5.3.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/httpcore-4.4.6.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/httpmime-4.5.3.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-annotations-2.9.5.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.9.5.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-databind-2.5.4.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-databind-2.9.5.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.9.5.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/janino-2.7.6.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/joda-time-2.2.jar
@@ -1068,13 +1132,14 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/noggit-0.8.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/org.restlet-2.3.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/org.restlet.ext.servlet-2.3.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/protobuf-java-3.1.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/rrd4j-3.2.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-%%PORTVERSION%%.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-%%PORTVERSION%%.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/spatial4j-0.6.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/spatial4j-0.7.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/stax2-api-3.1.4.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/t-digest-3.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/woodstox-core-asl-4.4.1.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-3.4.10.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-3.4.11.jar
 solr/server/solr-webapp/webapp/WEB-INF/web.xml
 solr/server/solr-webapp/webapp/css/angular/analysis.css
 solr/server/solr-webapp/webapp/css/angular/chosen.css
@@ -1096,9 +1161,9 @@ solr/server/solr-webapp/webapp/css/angular/replication.css
 solr/server/solr-webapp/webapp/css/angular/schema.css
 solr/server/solr-webapp/webapp/css/angular/segments.css
 solr/server/solr-webapp/webapp/css/angular/stream.css
+solr/server/solr-webapp/webapp/css/angular/suggestions.css
 solr/server/solr-webapp/webapp/css/angular/threads.css
 solr/server/solr-webapp/webapp/favicon.ico
-solr/server/solr-webapp/webapp/img/ZeroClipboard.swf
 solr/server/solr-webapp/webapp/img/chosen-sprite-2x.png
 solr/server/solr-webapp/webapp/img/chosen-sprite.png
 solr/server/solr-webapp/webapp/img/div.gif
@@ -1242,6 +1307,7 @@ solr/server/solr-webapp/webapp/img/ico/highlighter-text.png
 solr/server/solr-webapp/webapp/img/ico/home.png
 solr/server/solr-webapp/webapp/img/ico/hourglass--exclamation.png
 solr/server/solr-webapp/webapp/img/ico/hourglass.png
+solr/server/solr-webapp/webapp/img/ico/idea.png
 solr/server/solr-webapp/webapp/img/ico/inbox-document-text.png
 solr/server/solr-webapp/webapp/img/ico/information-button.png
 solr/server/solr-webapp/webapp/img/ico/information-small.png
@@ -1275,6 +1341,7 @@ solr/server/solr-webapp/webapp/img/ico/question-white.png
 solr/server/solr-webapp/webapp/img/ico/question.png
 solr/server/solr-webapp/webapp/img/ico/receipt-invoice.png
 solr/server/solr-webapp/webapp/img/ico/receipt.png
+solr/server/solr-webapp/webapp/img/ico/run.png
 solr/server/solr-webapp/webapp/img/ico/script-code.png
 solr/server/solr-webapp/webapp/img/ico/server-cast.png
 solr/server/solr-webapp/webapp/img/ico/server.png
@@ -1314,6 +1381,7 @@ solr/server/solr-webapp/webapp/index.html
 solr/server/solr-webapp/webapp/js/angular/app.js
 solr/server/solr-webapp/webapp/js/angular/controllers/analysis.js
 solr/server/solr-webapp/webapp/js/angular/controllers/cloud.js
+solr/server/solr-webapp/webapp/js/angular/controllers/cluster-suggestions.js
 solr/server/solr-webapp/webapp/js/angular/controllers/collection-overview.js
 solr/server/solr-webapp/webapp/js/angular/controllers/collections.js
 solr/server/solr-webapp/webapp/js/angular/controllers/core-overview.js
@@ -1352,6 +1420,7 @@ solr/server/solr-webapp/webapp/libs/jquery.jstree.js
 solr/server/solr-webapp/webapp/libs/ngtimeago.js
 solr/server/solr-webapp/webapp/partials/analysis.html
 solr/server/solr-webapp/webapp/partials/cloud.html
+solr/server/solr-webapp/webapp/partials/cluster_suggestions.html
 solr/server/solr-webapp/webapp/partials/collection_overview.html
 solr/server/solr-webapp/webapp/partials/collections.html
 solr/server/solr-webapp/webapp/partials/core_overview.html
@@ -1418,9 +1487,6 @@ solr/server/solr/configsets/_default/conf/synonyms.txt
 solr/server/solr/configsets/sample_techproducts_configs/conf/_rest_managed.json
 solr/server/solr/configsets/sample_techproducts_configs/conf/_schema_analysis_stopwords_english.json
 solr/server/solr/configsets/sample_techproducts_configs/conf/_schema_analysis_synonyms_english.json
-solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.html
-solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-bottom.html
-solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-top.html
 solr/server/solr/configsets/sample_techproducts_configs/conf/clustering/carrot2/README.txt
 solr/server/solr/configsets/sample_techproducts_configs/conf/clustering/carrot2/kmeans-attributes.xml
 solr/server/solr/configsets/sample_techproducts_configs/conf/clustering/carrot2/lingo-attributes.xml