SolrCore Initialization Failures
-Please check your logs for more information
- --
-
-
- Documentation -
- Issue Tracker -
- IRC Channel -
- Community forum -
- Solr Query Syntax - -
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 92e8d8d2628..3237fde391b 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -161,6 +161,8 @@ Other Changes * SOLR-10414: RecoveryStrategy is now a Runnable instead of a Thread. (Tomás Fernández Löbbe) +* SOLR-10042: Delete old deprecated Admin UI, leaving the AngularJS UI the only one supported (janhoy) + ================== 6.7.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/NOTICE.txt b/solr/NOTICE.txt index 54babbb9f23..d1f4e2fa2ed 100644 --- a/solr/NOTICE.txt +++ b/solr/NOTICE.txt @@ -25,15 +25,9 @@ Copyright (c) 2012, Michael Bostock, https://github.com/mbostock/d3 This product includes the highlight.js Javascript library created by Ivan Sagalaev Copyright (c) 2006, Ivan Sagalaev, https://github.com/isagalaev/highlight.js -This product includes the ZeroClipboard.js Javascript library created by Jon Rohan, James M. Greene -Copyright (c) 2012 Jon Rohan, James M. Greene, https://github.com/zeroclipboard/ZeroClipboard - This product includes the Chosen Javascript library created by Patrick Filler Copyright (c) 2011-2014 by Harvest, https://github.com/harvesthq/chosen -This product includes jquery.ajaxfileupload.js Javascript library created by Jordan Feldstein -Copyright (c) 2011 Jordan Feldstein, https://github.com/jfeldstein/jQuery.AjaxFileUpload.js - This product includes jquery.blockUI.js Javascript library created by Mike Alsup Copyright (c) 2007-2014 M. Alsup https://github.com/malsup/blockui/ @@ -43,18 +37,12 @@ Copyright (c) 2013-2014 Klaus Hartl, https://github.com/carhartl/jquery-cookie This product includes jquery.form Javascript library created by Mike Alsup Copyright 2006-2014 (c) M. Alsup, https://github.com/malsup/form/ -This product includes the jstree Javascript library created by Ivan Bozhanov +This product includes the jquery.jstree.js Javascript library created by Ivan Bozhanov Copyright (c) 2013-2014 Ivan Bozhanov, https://github.com/vakata/jstree -This product includes the Sammy.js Javascript library created by Aaron Quint -Copyright (c) 2008 Aaron Quint, Quirkey NYC, LLC, https://github.com/quirkey/sammy - This product includes jquery.timeago.js Javascript library by Ryan McGeary Copyright (c) 2008-2014, Ryan McGeary, https://github.com/rmm5t/jquery-timeago -This product includes linker.js Javascript library created by Michalis Tzikas & Vasilis Lolos -Copyright (C) 2011 by Michalis Tzikas & Vasilis Lolos, https://github.com/lolos/jquery-Linker/ - This product includes require.js Javascript library created by James Burke Copyright (C) 2010-2014 James Burke, https://github.com/jrburke/requirejs diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java index 133bc63284d..c17412fe860 100644 --- a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java +++ b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java @@ -42,6 +42,7 @@ import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.util.plugin.SolrCoreAware; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; diff --git a/solr/contrib/velocity/src/resources/velocity/head.vm b/solr/contrib/velocity/src/resources/velocity/head.vm index 38e5f0c13cd..40592941d62 100644 --- a/solr/contrib/velocity/src/resources/velocity/head.vm +++ b/solr/contrib/velocity/src/resources/velocity/head.vm @@ -9,7 +9,7 @@ - + ",rE:true,sL:"css"}},{cN:"tag",b:" - - -
- -- -
Please check your logs for more information
- -