SOLR-5973: Pluggable Ranking Collectors and Merge Strategies

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1597921 13f79535-47bb-0310-9956-ffa450edef68
SOLR-3671: fix ongoing smoke test build failure

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1597936 13f79535-47bb-0310-9956-ffa450edef68
Clean up SolrTestCaseJ4.recurseDelete a bit and remove hairy cases of removing the parent file in certain tests.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598012 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6118: expand.sort bug for function queries; needed to sort.rewrite(searcher)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598138 13f79535-47bb-0310-9956-ffa450edef68
Auto index & optimize imports.  And switch to java5 for-each in place of some iterators, generics issues.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598141 13f79535-47bb-0310-9956-ffa450edef68
Fix cast.  IntelliJ didn't seem to care.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598143 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6118: CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598193 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6029: fix smoke test failure

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598195 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6119: a quick workaround for the problem of removing files that are still open during the test.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598205 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6116: Refactor DocRouter.getDocRouter to accept routerName as a String

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598212 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5680: add aotmic DocValues updates

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598272 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5710: don't swallow innner immense term exception

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598275 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6120: zkcli.sh should expand solr.war automatically instead of throwing ClassNotFoundException

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598286 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5700: Add oal.util.Accountable and make all classes that can compute their memory usage implement it.


git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598470 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5708: remove IWC.clone

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598489 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5708: fix test bug

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598497 13f79535-47bb-0310-9956-ffa450edef68
listFiles can return null if a different thread removes the dir concurrently (may happen in Solr tests),..

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598499 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5708: fix test bug

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598503 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5442: ant check-lib-versions will fail the build if there are unexpected version conflicts between direct and transitive dependencies.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598538 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5708: fix these tests to also 'mimic' previous IWC.clone

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1598543 13f79535-47bb-0310-9956-ffa450edef68