You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/02/06 17:24:09 UTC

[15/15] lucene-solr git commit: Merge branch 'master' into nrt_replicas

Merge branch 'master' into nrt_replicas

Conflicts:
	lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bd6804bc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bd6804bc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bd6804bc

Branch: refs/heads/jira/lucene-5438-nrt-replication
Commit: bd6804bc6312c1a1d18294b5a670cc5eba7c9f48
Parents: b1b2c79 8e78469
Author: Mike McCandless <mi...@apache.org>
Authored: Sat Feb 6 11:14:15 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Sat Feb 6 11:14:15 2016 -0500

----------------------------------------------------------------------
 .../dot.settings/org.eclipse.jdt.ui.prefs       |   3 +-
 dev-tools/git/HELP.txt                          |  14 +
 .../idea/.idea/copyright/profiles_settings.xml  |   2 +-
 dev-tools/idea/lucene/sandbox/sandbox.iml       |   1 +
 lucene/CHANGES.txt                              |  39 +
 .../lucene/analysis/ar/ArabicAnalyzer.java      |   4 +-
 .../analysis/ar/ArabicNormalizationFilter.java  |   4 +-
 .../ar/ArabicNormalizationFilterFactory.java    |   4 +-
 .../lucene/analysis/ar/ArabicNormalizer.java    |   4 +-
 .../lucene/analysis/ar/ArabicStemFilter.java    |   4 +-
 .../analysis/ar/ArabicStemFilterFactory.java    |   4 +-
 .../lucene/analysis/ar/ArabicStemmer.java       |   6 +-
 .../lucene/analysis/bg/BulgarianAnalyzer.java   |   4 +-
 .../lucene/analysis/bg/BulgarianStemFilter.java |   4 +-
 .../analysis/bg/BulgarianStemFilterFactory.java |   4 +-
 .../lucene/analysis/bg/BulgarianStemmer.java    |   4 +-
 .../lucene/analysis/br/BrazilianAnalyzer.java   |   4 +-
 .../lucene/analysis/br/BrazilianStemFilter.java |   4 +-
 .../analysis/br/BrazilianStemFilterFactory.java |   4 +-
 .../lucene/analysis/br/BrazilianStemmer.java    |   8 +-
 .../lucene/analysis/ca/CatalanAnalyzer.java     |   4 +-
 .../analysis/charfilter/BaseCharFilter.java     |   1 -
 .../charfilter/HTMLStripCharFilter.java         |   3 +-
 .../charfilter/HTMLStripCharFilter.jflex        |   3 +-
 .../charfilter/HTMLStripCharFilterFactory.java  |   4 +-
 .../analysis/charfilter/MappingCharFilter.java  |   1 -
 .../charfilter/MappingCharFilterFactory.java    |   4 +-
 .../analysis/charfilter/NormalizeCharMap.java   |   1 -
 .../apache/lucene/analysis/cjk/CJKAnalyzer.java |   4 +-
 .../lucene/analysis/cjk/CJKBigramFilter.java    |   4 +-
 .../analysis/cjk/CJKBigramFilterFactory.java    |   4 +-
 .../lucene/analysis/cjk/CJKWidthFilter.java     |   4 +-
 .../analysis/cjk/CJKWidthFilterFactory.java     |   4 +-
 .../lucene/analysis/ckb/SoraniAnalyzer.java     |   4 +-
 .../analysis/ckb/SoraniNormalizationFilter.java |   4 +-
 .../ckb/SoraniNormalizationFilterFactory.java   |   4 +-
 .../lucene/analysis/ckb/SoraniNormalizer.java   |   4 +-
 .../lucene/analysis/ckb/SoraniStemFilter.java   |   4 +-
 .../analysis/ckb/SoraniStemFilterFactory.java   |   4 +-
 .../lucene/analysis/ckb/SoraniStemmer.java      |   4 +-
 .../analysis/commongrams/CommonGramsFilter.java |   1 -
 .../commongrams/CommonGramsFilterFactory.java   |   4 +-
 .../CommonGramsQueryFilterFactory.java          |   4 +-
 .../compound/CompoundWordTokenFilterBase.java   |   4 +-
 .../DictionaryCompoundWordTokenFilter.java      |   4 +-
 ...ictionaryCompoundWordTokenFilterFactory.java |   4 +-
 .../HyphenationCompoundWordTokenFilter.java     |   4 +-
 ...phenationCompoundWordTokenFilterFactory.java |   4 +-
 .../compound/hyphenation/ByteVector.java        |   7 +-
 .../compound/hyphenation/CharVector.java        |   7 +-
 .../analysis/compound/hyphenation/Hyphen.java   |   7 +-
 .../compound/hyphenation/Hyphenation.java       |   7 +-
 .../compound/hyphenation/HyphenationTree.java   |   7 +-
 .../compound/hyphenation/PatternConsumer.java   |   7 +-
 .../compound/hyphenation/PatternParser.java     |   7 +-
 .../compound/hyphenation/TernaryTree.java       |   7 +-
 .../analysis/core/DecimalDigitFilter.java       |   4 +-
 .../core/DecimalDigitFilterFactory.java         |   4 +-
 .../lucene/analysis/core/KeywordAnalyzer.java   |   4 +-
 .../lucene/analysis/core/KeywordTokenizer.java  |   4 +-
 .../analysis/core/KeywordTokenizerFactory.java  |   4 +-
 .../lucene/analysis/core/LetterTokenizer.java   |   4 +-
 .../analysis/core/LetterTokenizerFactory.java   |   4 +-
 .../lucene/analysis/core/LowerCaseFilter.java   |   4 +-
 .../analysis/core/LowerCaseFilterFactory.java   |   4 +-
 .../analysis/core/LowerCaseTokenizer.java       |   4 +-
 .../core/LowerCaseTokenizerFactory.java         |   4 +-
 .../lucene/analysis/core/SimpleAnalyzer.java    |   4 +-
 .../lucene/analysis/core/StopAnalyzer.java      |   4 +-
 .../apache/lucene/analysis/core/StopFilter.java |   4 +-
 .../lucene/analysis/core/StopFilterFactory.java |   4 +-
 .../lucene/analysis/core/TypeTokenFilter.java   |   4 +-
 .../analysis/core/TypeTokenFilterFactory.java   |   4 +-
 .../core/UnicodeWhitespaceAnalyzer.java         |   4 +-
 .../core/UnicodeWhitespaceTokenizer.java        |   4 +-
 .../lucene/analysis/core/UpperCaseFilter.java   |   4 +-
 .../analysis/core/UpperCaseFilterFactory.java   |   4 +-
 .../analysis/core/WhitespaceAnalyzer.java       |   4 +-
 .../analysis/core/WhitespaceTokenizer.java      |   4 +-
 .../core/WhitespaceTokenizerFactory.java        |   4 +-
 .../lucene/analysis/custom/CustomAnalyzer.java  |   4 +-
 .../lucene/analysis/cz/CzechAnalyzer.java       |   4 +-
 .../lucene/analysis/cz/CzechStemFilter.java     |  20 +-
 .../analysis/cz/CzechStemFilterFactory.java     |   4 +-
 .../apache/lucene/analysis/cz/CzechStemmer.java |   4 +-
 .../lucene/analysis/da/DanishAnalyzer.java      |   4 +-
 .../lucene/analysis/de/GermanAnalyzer.java      |   6 +-
 .../analysis/de/GermanLightStemFilter.java      |   4 +-
 .../de/GermanLightStemFilterFactory.java        |   4 +-
 .../lucene/analysis/de/GermanLightStemmer.java  |   4 +-
 .../analysis/de/GermanMinimalStemFilter.java    |   4 +-
 .../de/GermanMinimalStemFilterFactory.java      |   4 +-
 .../analysis/de/GermanMinimalStemmer.java       |   4 +-
 .../analysis/de/GermanNormalizationFilter.java  |   4 +-
 .../de/GermanNormalizationFilterFactory.java    |   4 +-
 .../lucene/analysis/de/GermanStemFilter.java    |   4 +-
 .../analysis/de/GermanStemFilterFactory.java    |   4 +-
 .../lucene/analysis/de/GermanStemmer.java       |  12 +-
 .../lucene/analysis/el/GreekAnalyzer.java       |  14 +-
 .../analysis/el/GreekLowerCaseFilter.java       |  14 +-
 .../el/GreekLowerCaseFilterFactory.java         |   4 +-
 .../lucene/analysis/el/GreekStemFilter.java     |   4 +-
 .../analysis/el/GreekStemFilterFactory.java     |   4 +-
 .../apache/lucene/analysis/el/GreekStemmer.java |  12 +-
 .../lucene/analysis/en/EnglishAnalyzer.java     |   4 +-
 .../analysis/en/EnglishMinimalStemFilter.java   |   4 +-
 .../en/EnglishMinimalStemFilterFactory.java     |   4 +-
 .../analysis/en/EnglishMinimalStemmer.java      |   4 +-
 .../analysis/en/EnglishPossessiveFilter.java    |   4 +-
 .../en/EnglishPossessiveFilterFactory.java      |   4 +-
 .../apache/lucene/analysis/en/KStemFilter.java  |   4 +-
 .../lucene/analysis/en/KStemFilterFactory.java  |   4 +-
 .../org/apache/lucene/analysis/en/KStemmer.java |   1 -
 .../lucene/analysis/en/PorterStemFilter.java    |   4 +-
 .../analysis/en/PorterStemFilterFactory.java    |   4 +-
 .../lucene/analysis/en/PorterStemmer.java       |   4 +-
 .../lucene/analysis/es/SpanishAnalyzer.java     |   4 +-
 .../analysis/es/SpanishLightStemFilter.java     |   4 +-
 .../es/SpanishLightStemFilterFactory.java       |   4 +-
 .../lucene/analysis/es/SpanishLightStemmer.java |   4 +-
 .../lucene/analysis/eu/BasqueAnalyzer.java      |   4 +-
 .../lucene/analysis/fa/PersianAnalyzer.java     |   4 +-
 .../lucene/analysis/fa/PersianCharFilter.java   |   4 +-
 .../analysis/fa/PersianCharFilterFactory.java   |   4 +-
 .../analysis/fa/PersianNormalizationFilter.java |   4 +-
 .../fa/PersianNormalizationFilterFactory.java   |   4 +-
 .../lucene/analysis/fa/PersianNormalizer.java   |   4 +-
 .../lucene/analysis/fi/FinnishAnalyzer.java     |   4 +-
 .../analysis/fi/FinnishLightStemFilter.java     |   4 +-
 .../fi/FinnishLightStemFilterFactory.java       |   4 +-
 .../lucene/analysis/fi/FinnishLightStemmer.java |   4 +-
 .../lucene/analysis/fr/FrenchAnalyzer.java      |   4 +-
 .../analysis/fr/FrenchLightStemFilter.java      |   4 +-
 .../fr/FrenchLightStemFilterFactory.java        |   4 +-
 .../lucene/analysis/fr/FrenchLightStemmer.java  |   4 +-
 .../analysis/fr/FrenchMinimalStemFilter.java    |   4 +-
 .../fr/FrenchMinimalStemFilterFactory.java      |   4 +-
 .../analysis/fr/FrenchMinimalStemmer.java       |   4 +-
 .../lucene/analysis/ga/IrishAnalyzer.java       |   4 +-
 .../analysis/ga/IrishLowerCaseFilter.java       |   4 +-
 .../ga/IrishLowerCaseFilterFactory.java         |   4 +-
 .../lucene/analysis/gl/GalicianAnalyzer.java    |   4 +-
 .../analysis/gl/GalicianMinimalStemFilter.java  |   4 +-
 .../gl/GalicianMinimalStemFilterFactory.java    |   4 +-
 .../analysis/gl/GalicianMinimalStemmer.java     |   4 +-
 .../lucene/analysis/gl/GalicianStemFilter.java  |   4 +-
 .../analysis/gl/GalicianStemFilterFactory.java  |   4 +-
 .../lucene/analysis/gl/GalicianStemmer.java     |   4 +-
 .../lucene/analysis/hi/HindiAnalyzer.java       |   4 +-
 .../analysis/hi/HindiNormalizationFilter.java   |   4 +-
 .../hi/HindiNormalizationFilterFactory.java     |   4 +-
 .../lucene/analysis/hi/HindiNormalizer.java     |   4 +-
 .../lucene/analysis/hi/HindiStemFilter.java     |   4 +-
 .../analysis/hi/HindiStemFilterFactory.java     |   4 +-
 .../apache/lucene/analysis/hi/HindiStemmer.java |   4 +-
 .../lucene/analysis/hu/HungarianAnalyzer.java   |   4 +-
 .../analysis/hu/HungarianLightStemFilter.java   |   4 +-
 .../hu/HungarianLightStemFilterFactory.java     |   4 +-
 .../analysis/hu/HungarianLightStemmer.java      |   4 +-
 .../lucene/analysis/hunspell/Dictionary.java    |   4 +-
 .../analysis/hunspell/HunspellStemFilter.java   |   4 +-
 .../hunspell/HunspellStemFilterFactory.java     |   4 +-
 .../analysis/hunspell/ISO8859_14Decoder.java    |   4 +-
 .../lucene/analysis/hunspell/Stemmer.java       |   4 +-
 .../lucene/analysis/hy/ArmenianAnalyzer.java    |   4 +-
 .../lucene/analysis/id/IndonesianAnalyzer.java  |   4 +-
 .../analysis/id/IndonesianStemFilter.java       |   4 +-
 .../id/IndonesianStemFilterFactory.java         |   4 +-
 .../lucene/analysis/id/IndonesianStemmer.java   |   4 +-
 .../analysis/in/IndicNormalizationFilter.java   |   4 +-
 .../in/IndicNormalizationFilterFactory.java     |   4 +-
 .../lucene/analysis/in/IndicNormalizer.java     |   4 +-
 .../lucene/analysis/it/ItalianAnalyzer.java     |   4 +-
 .../analysis/it/ItalianLightStemFilter.java     |   4 +-
 .../it/ItalianLightStemFilterFactory.java       |   4 +-
 .../lucene/analysis/it/ItalianLightStemmer.java |   4 +-
 .../lucene/analysis/lt/LithuanianAnalyzer.java  |   4 +-
 .../lucene/analysis/lv/LatvianAnalyzer.java     |   4 +-
 .../lucene/analysis/lv/LatvianStemFilter.java   |   4 +-
 .../analysis/lv/LatvianStemFilterFactory.java   |   4 +-
 .../lucene/analysis/lv/LatvianStemmer.java      |   8 +-
 .../miscellaneous/ASCIIFoldingFilter.java       |   4 +-
 .../ASCIIFoldingFilterFactory.java              |   4 +-
 .../miscellaneous/CapitalizationFilter.java     |   4 +-
 .../CapitalizationFilterFactory.java            |   4 +-
 .../miscellaneous/CodepointCountFilter.java     |   4 +-
 .../CodepointCountFilterFactory.java            |   4 +-
 .../miscellaneous/DateRecognizerFilter.java     |   4 +-
 .../DateRecognizerFilterFactory.java            |   4 +-
 .../miscellaneous/EmptyTokenStream.java         |   4 +-
 .../miscellaneous/FingerprintFilter.java        |   4 +-
 .../miscellaneous/FingerprintFilterFactory.java |   4 +-
 .../miscellaneous/HyphenatedWordsFilter.java    |   4 +-
 .../HyphenatedWordsFilterFactory.java           |   4 +-
 .../analysis/miscellaneous/KeepWordFilter.java  |   1 -
 .../miscellaneous/KeepWordFilterFactory.java    |   4 +-
 .../miscellaneous/KeywordMarkerFilter.java      |   4 +-
 .../KeywordMarkerFilterFactory.java             |   4 +-
 .../miscellaneous/KeywordRepeatFilter.java      |   4 +-
 .../KeywordRepeatFilterFactory.java             |   4 +-
 .../analysis/miscellaneous/LengthFilter.java    |   4 +-
 .../miscellaneous/LengthFilterFactory.java      |   4 +-
 .../miscellaneous/LimitTokenCountAnalyzer.java  |   4 +-
 .../miscellaneous/LimitTokenCountFilter.java    |   4 +-
 .../LimitTokenCountFilterFactory.java           |   4 +-
 .../miscellaneous/LimitTokenOffsetFilter.java   |   4 +-
 .../LimitTokenOffsetFilterFactory.java          |   4 +-
 .../miscellaneous/LimitTokenPositionFilter.java |   2 +-
 .../LimitTokenPositionFilterFactory.java        |   2 +-
 .../PatternKeywordMarkerFilter.java             |   4 +-
 .../miscellaneous/PerFieldAnalyzerWrapper.java  |   4 +-
 .../PrefixAndSuffixAwareTokenFilter.java        |   4 +-
 .../miscellaneous/PrefixAwareTokenFilter.java   |   4 +-
 .../RemoveDuplicatesTokenFilter.java            |   1 -
 .../RemoveDuplicatesTokenFilterFactory.java     |   4 +-
 .../ScandinavianFoldingFilter.java              |   4 +-
 .../ScandinavianFoldingFilterFactory.java       |   4 +-
 .../ScandinavianNormalizationFilter.java        |   4 +-
 .../ScandinavianNormalizationFilterFactory.java |   4 +-
 .../miscellaneous/SetKeywordMarkerFilter.java   |   2 +-
 .../miscellaneous/StemmerOverrideFilter.java    |   4 +-
 .../StemmerOverrideFilterFactory.java           |   4 +-
 .../analysis/miscellaneous/TrimFilter.java      |   1 -
 .../miscellaneous/TrimFilterFactory.java        |   4 +-
 .../miscellaneous/TruncateTokenFilter.java      |   4 +-
 .../TruncateTokenFilterFactory.java             |   4 +-
 .../miscellaneous/WordDelimiterFilter.java      |   3 +-
 .../WordDelimiterFilterFactory.java             |   4 +-
 .../miscellaneous/WordDelimiterIterator.java    |   4 +-
 .../analysis/ngram/EdgeNGramFilterFactory.java  |   4 +-
 .../analysis/ngram/EdgeNGramTokenFilter.java    |   4 +-
 .../analysis/ngram/EdgeNGramTokenizer.java      |   4 +-
 .../ngram/EdgeNGramTokenizerFactory.java        |   4 +-
 .../analysis/ngram/NGramFilterFactory.java      |   4 +-
 .../lucene/analysis/ngram/NGramTokenFilter.java |   4 +-
 .../lucene/analysis/ngram/NGramTokenizer.java   |   4 +-
 .../analysis/ngram/NGramTokenizerFactory.java   |   4 +-
 .../lucene/analysis/nl/DutchAnalyzer.java       |   4 +-
 .../lucene/analysis/no/NorwegianAnalyzer.java   |   4 +-
 .../analysis/no/NorwegianLightStemFilter.java   |   4 +-
 .../no/NorwegianLightStemFilterFactory.java     |   4 +-
 .../analysis/no/NorwegianLightStemmer.java      |   4 +-
 .../analysis/no/NorwegianMinimalStemFilter.java |   4 +-
 .../no/NorwegianMinimalStemFilterFactory.java   |   4 +-
 .../analysis/no/NorwegianMinimalStemmer.java    |   4 +-
 .../analysis/path/PathHierarchyTokenizer.java   |   2 +-
 .../path/PathHierarchyTokenizerFactory.java     |   4 +-
 .../path/ReversePathHierarchyTokenizer.java     |   2 +-
 .../PatternCaptureGroupFilterFactory.java       |   4 +-
 .../pattern/PatternCaptureGroupTokenFilter.java |   4 +-
 .../pattern/PatternReplaceCharFilter.java       |   1 -
 .../PatternReplaceCharFilterFactory.java        |   4 +-
 .../analysis/pattern/PatternReplaceFilter.java  |   1 -
 .../pattern/PatternReplaceFilterFactory.java    |   4 +-
 .../analysis/pattern/PatternTokenizer.java      |   1 -
 .../pattern/PatternTokenizerFactory.java        |   4 +-
 .../analysis/payloads/AbstractEncoder.java      |   8 +-
 .../payloads/DelimitedPayloadTokenFilter.java   |   2 +-
 .../DelimitedPayloadTokenFilterFactory.java     |   4 +-
 .../lucene/analysis/payloads/FloatEncoder.java  |   8 +-
 .../analysis/payloads/IdentityEncoder.java      |   2 +-
 .../analysis/payloads/IntegerEncoder.java       |   2 +-
 .../payloads/NumericPayloadTokenFilter.java     |   2 +-
 .../NumericPayloadTokenFilterFactory.java       |   4 +-
 .../analysis/payloads/PayloadEncoder.java       |   8 +-
 .../lucene/analysis/payloads/PayloadHelper.java |   2 +-
 .../payloads/TokenOffsetPayloadTokenFilter.java |   2 +-
 .../TokenOffsetPayloadTokenFilterFactory.java   |   4 +-
 .../payloads/TypeAsPayloadTokenFilter.java      |   2 +-
 .../TypeAsPayloadTokenFilterFactory.java        |   4 +-
 .../lucene/analysis/pt/PortugueseAnalyzer.java  |   4 +-
 .../analysis/pt/PortugueseLightStemFilter.java  |   4 +-
 .../pt/PortugueseLightStemFilterFactory.java    |   4 +-
 .../analysis/pt/PortugueseLightStemmer.java     |   4 +-
 .../pt/PortugueseMinimalStemFilter.java         |   4 +-
 .../pt/PortugueseMinimalStemFilterFactory.java  |   4 +-
 .../analysis/pt/PortugueseMinimalStemmer.java   |   4 +-
 .../analysis/pt/PortugueseStemFilter.java       |   4 +-
 .../pt/PortugueseStemFilterFactory.java         |   4 +-
 .../lucene/analysis/pt/PortugueseStemmer.java   |   4 +-
 .../lucene/analysis/pt/RSLPStemmerBase.java     |   4 +-
 .../query/QueryAutoStopWordAnalyzer.java        |   2 +-
 .../analysis/reverse/ReverseStringFilter.java   |   1 -
 .../reverse/ReverseStringFilterFactory.java     |   4 +-
 .../lucene/analysis/ro/RomanianAnalyzer.java    |   4 +-
 .../lucene/analysis/ru/RussianAnalyzer.java     |   4 +-
 .../analysis/ru/RussianLightStemFilter.java     |   4 +-
 .../ru/RussianLightStemFilterFactory.java       |   4 +-
 .../lucene/analysis/ru/RussianLightStemmer.java |   4 +-
 .../shingle/ShingleAnalyzerWrapper.java         |   4 +-
 .../lucene/analysis/shingle/ShingleFilter.java  |   4 +-
 .../analysis/shingle/ShingleFilterFactory.java  |   4 +-
 .../analysis/sinks/TeeSinkTokenFilter.java      |   4 +-
 .../analysis/snowball/SnowballFilter.java       |   4 +-
 .../snowball/SnowballPorterFilterFactory.java   |   4 +-
 .../analysis/sr/SerbianNormalizationFilter.java |   4 +-
 .../sr/SerbianNormalizationFilterFactory.java   |   4 +-
 .../sr/SerbianNormalizationRegularFilter.java   |   4 +-
 .../analysis/standard/ClassicAnalyzer.java      |   4 +-
 .../lucene/analysis/standard/ClassicFilter.java |   4 +-
 .../analysis/standard/ClassicFilterFactory.java |   4 +-
 .../analysis/standard/ClassicTokenizer.java     |   1 -
 .../standard/ClassicTokenizerFactory.java       |   4 +-
 .../analysis/standard/ClassicTokenizerImpl.java |   3 +-
 .../standard/ClassicTokenizerImpl.jflex         |   3 +-
 .../analysis/standard/StandardAnalyzer.java     |   4 +-
 .../analysis/standard/StandardFilter.java       |   4 +-
 .../standard/StandardFilterFactory.java         |   4 +-
 .../analysis/standard/StandardTokenizer.java    |   1 -
 .../standard/StandardTokenizerFactory.java      |   4 +-
 .../standard/StandardTokenizerImpl.java         |   3 +-
 .../standard/StandardTokenizerImpl.jflex        |   3 +-
 .../standard/UAX29URLEmailAnalyzer.java         |   4 +-
 .../standard/UAX29URLEmailTokenizer.java        |   4 +-
 .../standard/UAX29URLEmailTokenizerFactory.java |   4 +-
 .../standard/UAX29URLEmailTokenizerImpl.java    |   3 +-
 .../standard/UAX29URLEmailTokenizerImpl.jflex   |   3 +-
 .../lucene/analysis/sv/SwedishAnalyzer.java     |   4 +-
 .../analysis/sv/SwedishLightStemFilter.java     |   4 +-
 .../sv/SwedishLightStemFilterFactory.java       |   4 +-
 .../lucene/analysis/sv/SwedishLightStemmer.java |   4 +-
 .../analysis/synonym/SolrSynonymParser.java     |   4 +-
 .../lucene/analysis/synonym/SynonymFilter.java  |   4 +-
 .../analysis/synonym/SynonymFilterFactory.java  |   4 +-
 .../lucene/analysis/synonym/SynonymMap.java     |   4 +-
 .../analysis/synonym/WordnetSynonymParser.java  |   4 +-
 .../apache/lucene/analysis/th/ThaiAnalyzer.java |  14 +-
 .../lucene/analysis/th/ThaiTokenizer.java       |   4 +-
 .../analysis/th/ThaiTokenizerFactory.java       |   4 +-
 .../lucene/analysis/tr/ApostropheFilter.java    |   4 +-
 .../analysis/tr/ApostropheFilterFactory.java    |   4 +-
 .../lucene/analysis/tr/TurkishAnalyzer.java     |   4 +-
 .../analysis/tr/TurkishLowerCaseFilter.java     |   4 +-
 .../tr/TurkishLowerCaseFilterFactory.java       |   4 +-
 .../analysis/util/AbstractAnalysisFactory.java  |   4 +-
 .../lucene/analysis/util/AnalysisSPILoader.java |   4 +-
 .../lucene/analysis/util/CharArrayIterator.java |   4 +-
 .../lucene/analysis/util/CharArrayMap.java      |   4 +-
 .../lucene/analysis/util/CharArraySet.java      |   4 +-
 .../lucene/analysis/util/CharFilterFactory.java |   4 +-
 .../lucene/analysis/util/CharTokenizer.java     |   4 +-
 .../lucene/analysis/util/CharacterUtils.java    |   4 +-
 .../analysis/util/ClasspathResourceLoader.java  |   4 +-
 .../lucene/analysis/util/ElisionFilter.java     |   4 +-
 .../analysis/util/ElisionFilterFactory.java     |   4 +-
 .../analysis/util/FilesystemResourceLoader.java |   4 +-
 .../analysis/util/FilteringTokenFilter.java     |   4 +-
 .../analysis/util/MultiTermAwareComponent.java  |   4 +-
 .../lucene/analysis/util/OpenStringBuilder.java |   4 +-
 .../lucene/analysis/util/ResourceLoader.java    |   4 +-
 .../analysis/util/ResourceLoaderAware.java      |   1 -
 .../lucene/analysis/util/RollingCharBuffer.java |   4 +-
 .../analysis/util/SegmentingTokenizerBase.java  |   4 +-
 .../lucene/analysis/util/StemmerUtil.java       |   4 +-
 .../analysis/util/StopwordAnalyzerBase.java     |   1 -
 .../analysis/util/TokenFilterFactory.java       |   4 +-
 .../lucene/analysis/util/TokenizerFactory.java  |   4 +-
 .../lucene/analysis/util/WordlistLoader.java    |   4 +-
 .../analysis/wikipedia/WikipediaTokenizer.java  |   1 -
 .../wikipedia/WikipediaTokenizerFactory.java    |   4 +-
 .../wikipedia/WikipediaTokenizerImpl.java       |   3 +-
 .../wikipedia/WikipediaTokenizerImpl.jflex      |   3 +-
 .../collation/CollationAttributeFactory.java    |   4 +-
 .../collation/CollationDocValuesField.java      |   4 +-
 .../lucene/collation/CollationKeyAnalyzer.java  |   4 +-
 .../CollatedTermAttributeImpl.java              |   4 +-
 .../lucene/analysis/ar/TestArabicAnalyzer.java  |   4 +-
 .../lucene/analysis/ar/TestArabicFilters.java   |   4 +-
 .../ar/TestArabicNormalizationFilter.java       |   4 +-
 .../analysis/ar/TestArabicStemFilter.java       |   4 +-
 .../analysis/bg/TestBulgarianAnalyzer.java      |   4 +-
 .../bg/TestBulgarianStemFilterFactory.java      |   4 +-
 .../analysis/bg/TestBulgarianStemmer.java       |   4 +-
 .../analysis/br/TestBrazilianAnalyzer.java      |   4 +-
 .../br/TestBrazilianStemFilterFactory.java      |   4 +-
 .../lucene/analysis/ca/TestCatalanAnalyzer.java |   4 +-
 .../charfilter/HTMLStripCharFilterTest.java     |   4 +-
 .../TestHTMLStripCharFilterFactory.java         |   4 +-
 .../charfilter/TestMappingCharFilter.java       |   1 -
 .../TestMappingCharFilterFactory.java           |   4 +-
 .../lucene/analysis/cjk/TestCJKAnalyzer.java    |   4 +-
 .../analysis/cjk/TestCJKBigramFilter.java       |   4 +-
 .../cjk/TestCJKBigramFilterFactory.java         |   4 +-
 .../lucene/analysis/cjk/TestCJKWidthFilter.java |   4 +-
 .../analysis/cjk/TestCJKWidthFilterFactory.java |   4 +-
 .../lucene/analysis/ckb/TestSoraniAnalyzer.java |   4 +-
 .../ckb/TestSoraniNormalizationFilter.java      |   4 +-
 .../TestSoraniNormalizationFilterFactory.java   |   4 +-
 .../analysis/ckb/TestSoraniStemFilter.java      |   4 +-
 .../ckb/TestSoraniStemFilterFactory.java        |   4 +-
 .../TestCommonGramsFilterFactory.java           |   4 +-
 .../TestCommonGramsQueryFilterFactory.java      |   4 +-
 .../compound/TestCompoundWordTokenFilter.java   |   4 +-
 ...ictionaryCompoundWordTokenFilterFactory.java |   4 +-
 ...phenationCompoundWordTokenFilterFactory.java |   4 +-
 .../core/TestAllAnalyzersHaveFactories.java     |   4 +-
 .../lucene/analysis/core/TestAnalyzers.java     |   4 +-
 .../analysis/core/TestBugInSomething.java       |  32 +-
 .../analysis/core/TestDecimalDigitFilter.java   |   4 +-
 .../core/TestDecimalDigitFilterFactory.java     |   4 +-
 .../analysis/core/TestDuelingAnalyzers.java     |   4 +-
 .../lucene/analysis/core/TestFactories.java     |   4 +-
 .../analysis/core/TestKeywordAnalyzer.java      |   4 +-
 .../lucene/analysis/core/TestRandomChains.java  |   4 +-
 .../lucene/analysis/core/TestStopAnalyzer.java  |   4 +-
 .../lucene/analysis/core/TestStopFilter.java    |  15 +-
 .../analysis/core/TestStopFilterFactory.java    |   4 +-
 .../analysis/core/TestTypeTokenFilter.java      |   4 +-
 .../core/TestTypeTokenFilterFactory.java        |   4 +-
 .../core/TestUnicodeWhitespaceTokenizer.java    |   4 +-
 .../analysis/custom/TestCustomAnalyzer.java     |   4 +-
 .../lucene/analysis/cz/TestCzechAnalyzer.java   |   4 +-
 .../analysis/cz/TestCzechStemFilterFactory.java |   4 +-
 .../lucene/analysis/cz/TestCzechStemmer.java    |   4 +-
 .../lucene/analysis/da/TestDanishAnalyzer.java  |   4 +-
 .../lucene/analysis/de/TestGermanAnalyzer.java  |   4 +-
 .../analysis/de/TestGermanLightStemFilter.java  |   4 +-
 .../de/TestGermanLightStemFilterFactory.java    |   4 +-
 .../de/TestGermanMinimalStemFilter.java         |   4 +-
 .../de/TestGermanMinimalStemFilterFactory.java  |   4 +-
 .../de/TestGermanNormalizationFilter.java       |   4 +-
 .../TestGermanNormalizationFilterFactory.java   |   4 +-
 .../analysis/de/TestGermanStemFilter.java       |   4 +-
 .../de/TestGermanStemFilterFactory.java         |   4 +-
 .../lucene/analysis/el/GreekAnalyzerTest.java   |  14 +-
 .../el/TestGreekLowerCaseFilterFactory.java     |   4 +-
 .../analysis/el/TestGreekStemFilterFactory.java |   4 +-
 .../lucene/analysis/el/TestGreekStemmer.java    |   4 +-
 .../lucene/analysis/en/TestEnglishAnalyzer.java |   4 +-
 .../en/TestEnglishMinimalStemFilter.java        |   4 +-
 .../en/TestEnglishMinimalStemFilterFactory.java |   4 +-
 .../analysis/en/TestKStemFilterFactory.java     |   4 +-
 .../apache/lucene/analysis/en/TestKStemmer.java |   4 +-
 .../analysis/en/TestPorterStemFilter.java       |   4 +-
 .../en/TestPorterStemFilterFactory.java         |   4 +-
 .../lucene/analysis/es/TestSpanishAnalyzer.java |   4 +-
 .../analysis/es/TestSpanishLightStemFilter.java |   4 +-
 .../es/TestSpanishLightStemFilterFactory.java   |   4 +-
 .../lucene/analysis/eu/TestBasqueAnalyzer.java  |   4 +-
 .../lucene/analysis/fa/TestPersianAnalyzer.java |   4 +-
 .../analysis/fa/TestPersianCharFilter.java      |   4 +-
 .../fa/TestPersianNormalizationFilter.java      |   4 +-
 .../TestPersianNormalizationFilterFactory.java  |   4 +-
 .../lucene/analysis/fi/TestFinnishAnalyzer.java |   4 +-
 .../analysis/fi/TestFinnishLightStemFilter.java |   4 +-
 .../fi/TestFinnishLightStemFilterFactory.java   |   4 +-
 .../lucene/analysis/fr/TestFrenchAnalyzer.java  |   4 +-
 .../analysis/fr/TestFrenchLightStemFilter.java  |   4 +-
 .../fr/TestFrenchLightStemFilterFactory.java    |   4 +-
 .../fr/TestFrenchMinimalStemFilter.java         |   4 +-
 .../fr/TestFrenchMinimalStemFilterFactory.java  |   4 +-
 .../lucene/analysis/ga/TestIrishAnalyzer.java   |   4 +-
 .../analysis/ga/TestIrishLowerCaseFilter.java   |   4 +-
 .../ga/TestIrishLowerCaseFilterFactory.java     |   4 +-
 .../analysis/gl/TestGalicianAnalyzer.java       |   4 +-
 .../gl/TestGalicianMinimalStemFilter.java       |   4 +-
 .../TestGalicianMinimalStemFilterFactory.java   |   4 +-
 .../analysis/gl/TestGalicianStemFilter.java     |   4 +-
 .../gl/TestGalicianStemFilterFactory.java       |   4 +-
 .../lucene/analysis/hi/TestHindiAnalyzer.java   |  14 +-
 .../lucene/analysis/hi/TestHindiFilters.java    |   4 +-
 .../lucene/analysis/hi/TestHindiNormalizer.java |   4 +-
 .../lucene/analysis/hi/TestHindiStemmer.java    |   4 +-
 .../analysis/hu/TestHungarianAnalyzer.java      |   4 +-
 .../hu/TestHungarianLightStemFilter.java        |   4 +-
 .../hu/TestHungarianLightStemFilterFactory.java |   4 +-
 .../analysis/hunspell/StemmerTestBase.java      |   4 +-
 .../analysis/hunspell/Test64kAffixes.java       |   8 +-
 .../analysis/hunspell/TestAllDictionaries.java  |  10 +-
 .../analysis/hunspell/TestAllDictionaries2.java |  10 +-
 .../analysis/hunspell/TestAlternateCasing.java  |   4 +-
 .../analysis/hunspell/TestCaseInsensitive.java  |   4 +-
 .../analysis/hunspell/TestCaseSensitive.java    |   4 +-
 .../lucene/analysis/hunspell/TestCircumfix.java |   4 +-
 .../analysis/hunspell/TestComplexPrefix.java    |   4 +-
 .../lucene/analysis/hunspell/TestCondition.java |   4 +-
 .../analysis/hunspell/TestCondition2.java       |   8 +-
 .../lucene/analysis/hunspell/TestConv.java      |   8 +-
 .../analysis/hunspell/TestDependencies.java     |   4 +-
 .../analysis/hunspell/TestDictionary.java       |  10 +-
 .../analysis/hunspell/TestDoubleEscape.java     |   4 +-
 .../lucene/analysis/hunspell/TestEscaped.java   |   4 +-
 .../lucene/analysis/hunspell/TestFlagLong.java  |   4 +-
 .../lucene/analysis/hunspell/TestFlagNum.java   |   4 +-
 .../lucene/analysis/hunspell/TestFullStrip.java |   4 +-
 .../lucene/analysis/hunspell/TestHomonyms.java  |   4 +-
 .../hunspell/TestHunspellStemFilter.java        |  10 +-
 .../hunspell/TestHunspellStemFilterFactory.java |   4 +-
 .../lucene/analysis/hunspell/TestIgnore.java    |   4 +-
 .../lucene/analysis/hunspell/TestKeepCase.java  |   4 +-
 .../lucene/analysis/hunspell/TestMorph.java     |   4 +-
 .../analysis/hunspell/TestMorphAlias.java       |   4 +-
 .../lucene/analysis/hunspell/TestMorphData.java |   4 +-
 .../lucene/analysis/hunspell/TestNeedAffix.java |   4 +-
 .../analysis/hunspell/TestOnlyInCompound.java   |   4 +-
 .../hunspell/TestOptionalCondition.java         |   4 +-
 .../lucene/analysis/hunspell/TestSpaces.java    |   4 +-
 .../lucene/analysis/hunspell/TestStemmer.java   |   4 +-
 .../hunspell/TestStrangeOvergeneration.java     |   4 +-
 .../lucene/analysis/hunspell/TestTwoFold.java   |   4 +-
 .../analysis/hunspell/TestTwoSuffixes.java      |   4 +-
 .../lucene/analysis/hunspell/TestZeroAffix.java |   4 +-
 .../analysis/hunspell/TestZeroAffix2.java       |   4 +-
 .../analysis/hy/TestArmenianAnalyzer.java       |   4 +-
 .../analysis/id/TestIndonesianAnalyzer.java     |   4 +-
 .../id/TestIndonesianStemFilterFactory.java     |   4 +-
 .../analysis/id/TestIndonesianStemmer.java      |   4 +-
 .../lucene/analysis/in/TestIndicNormalizer.java |   4 +-
 .../lucene/analysis/it/TestItalianAnalyzer.java |   4 +-
 .../analysis/it/TestItalianLightStemFilter.java |   4 +-
 .../it/TestItalianLightStemFilterFactory.java   |   4 +-
 .../analysis/lt/TestLithuanianAnalyzer.java     |   4 +-
 .../analysis/lt/TestLithuanianStemming.java     |   4 +-
 .../lucene/analysis/lv/TestLatvianAnalyzer.java |   4 +-
 .../lv/TestLatvianStemFilterFactory.java        |   4 +-
 .../lucene/analysis/lv/TestLatvianStemmer.java  |   4 +-
 .../DateRecognizerFilterFactoryTest.java        |  14 +-
 .../miscellaneous/DateRecognizerFilterTest.java |  14 +-
 .../miscellaneous/TestASCIIFoldingFilter.java   |   4 +-
 .../miscellaneous/TestCapitalizationFilter.java |   1 -
 .../TestCapitalizationFilterFactory.java        |   4 +-
 .../miscellaneous/TestCodepointCountFilter.java |   4 +-
 .../TestCodepointCountFilterFactory.java        |   4 +-
 .../miscellaneous/TestEmptyTokenStream.java     |   4 +-
 .../miscellaneous/TestFingerprintFilter.java    |   4 +-
 .../TestFingerprintFilterFactory.java           |   4 +-
 .../TestHyphenatedWordsFilter.java              |   1 -
 .../miscellaneous/TestKeepFilterFactory.java    |   4 +-
 .../miscellaneous/TestKeepWordFilter.java       |   1 -
 .../miscellaneous/TestKeywordMarkerFilter.java  |  32 +-
 .../TestKeywordMarkerFilterFactory.java         |   4 +-
 .../miscellaneous/TestKeywordRepeatFilter.java  |   4 +-
 .../miscellaneous/TestLengthFilter.java         |   4 +-
 .../miscellaneous/TestLengthFilterFactory.java  |   4 +-
 .../TestLimitTokenCountAnalyzer.java            |   4 +-
 .../TestLimitTokenCountFilter.java              |   4 +-
 .../TestLimitTokenCountFilterFactory.java       |   4 +-
 .../TestLimitTokenOffsetFilter.java             |   4 +-
 .../TestLimitTokenOffsetFilterFactory.java      |   4 +-
 .../TestLimitTokenPositionFilter.java           |   2 +-
 .../TestLimitTokenPositionFilterFactory.java    |   2 +-
 .../TestPerFieldAnalyzerWrapper.java            |  32 +-
 .../TestPrefixAndSuffixAwareTokenFilter.java    |   4 +-
 .../TestPrefixAwareTokenFilter.java             |   4 +-
 .../TestRemoveDuplicatesTokenFilter.java        |   1 -
 .../TestRemoveDuplicatesTokenFilterFactory.java |   4 +-
 .../TestScandinavianFoldingFilter.java          |   4 +-
 .../TestScandinavianFoldingFilterFactory.java   |  15 +-
 .../TestScandinavianNormalizationFilter.java    |   4 +-
 ...tScandinavianNormalizationFilterFactory.java |  18 +-
 .../TestStemmerOverrideFilter.java              |   2 +-
 .../TestStemmerOverrideFilterFactory.java       |   4 +-
 .../analysis/miscellaneous/TestTrimFilter.java  |   1 -
 .../miscellaneous/TestTrimFilterFactory.java    |   4 +-
 .../miscellaneous/TestTruncateTokenFilter.java  |   4 +-
 .../TestTruncateTokenFilterFactory.java         |   4 +-
 .../miscellaneous/TestWordDelimiterFilter.java  |   1 -
 .../ngram/EdgeNGramTokenFilterTest.java         |   4 +-
 .../analysis/ngram/EdgeNGramTokenizerTest.java  |   4 +-
 .../analysis/ngram/NGramTokenFilterTest.java    |   4 +-
 .../analysis/ngram/NGramTokenizerTest.java      |   4 +-
 .../lucene/analysis/ngram/TestNGramFilters.java |   4 +-
 .../lucene/analysis/nl/TestDutchAnalyzer.java   |   4 +-
 .../analysis/no/TestNorwegianAnalyzer.java      |   4 +-
 .../no/TestNorwegianLightStemFilter.java        |   4 +-
 .../no/TestNorwegianLightStemFilterFactory.java |   4 +-
 .../no/TestNorwegianMinimalStemFilter.java      |   4 +-
 .../TestNorwegianMinimalStemFilterFactory.java  |   4 +-
 .../path/TestPathHierarchyTokenizer.java        |   4 +-
 .../path/TestReversePathHierarchyTokenizer.java |   4 +-
 .../TestPatternCaptureGroupTokenFilter.java     |   4 +-
 .../pattern/TestPatternReplaceCharFilter.java   |   1 -
 .../TestPatternReplaceCharFilterFactory.java    |   4 +-
 .../pattern/TestPatternReplaceFilter.java       |   1 -
 .../TestPatternReplaceFilterFactory.java        |   4 +-
 .../analysis/pattern/TestPatternTokenizer.java  |   1 -
 .../pattern/TestPatternTokenizerFactory.java    |   4 +-
 .../DelimitedPayloadTokenFilterTest.java        |   2 +-
 .../payloads/NumericPayloadTokenFilterTest.java |  14 +-
 .../TestDelimitedPayloadTokenFilterFactory.java |   4 +-
 .../TokenOffsetPayloadTokenFilterTest.java      |  15 +-
 .../payloads/TypeAsPayloadTokenFilterTest.java  |  17 +-
 .../analysis/pt/TestPortugueseAnalyzer.java     |   4 +-
 .../pt/TestPortugueseLightStemFilter.java       |   4 +-
 .../TestPortugueseLightStemFilterFactory.java   |   4 +-
 .../pt/TestPortugueseMinimalStemFilter.java     |   4 +-
 .../TestPortugueseMinimalStemFilterFactory.java |   4 +-
 .../analysis/pt/TestPortugueseStemFilter.java   |   4 +-
 .../pt/TestPortugueseStemFilterFactory.java     |   4 +-
 .../query/QueryAutoStopWordAnalyzerTest.java    |   2 +-
 .../reverse/TestReverseStringFilter.java        |   1 -
 .../reverse/TestReverseStringFilterFactory.java |   4 +-
 .../analysis/ro/TestRomanianAnalyzer.java       |   4 +-
 .../lucene/analysis/ru/TestRussianAnalyzer.java |   4 +-
 .../analysis/ru/TestRussianLightStemFilter.java |   4 +-
 .../ru/TestRussianLightStemFilterFactory.java   |   4 +-
 .../shingle/ShingleAnalyzerWrapperTest.java     |   4 +-
 .../analysis/shingle/ShingleFilterTest.java     |   4 +-
 .../shingle/TestShingleFilterFactory.java       |   4 +-
 .../analysis/sinks/TestTeeSinkTokenFilter.java  |  14 +-
 .../lucene/analysis/snowball/TestSnowball.java  |   4 +-
 .../TestSnowballPorterFilterFactory.java        |  15 +-
 .../analysis/snowball/TestSnowballVocab.java    |   4 +-
 .../sr/TestSerbianNormalizationFilter.java      |   4 +-
 .../TestSerbianNormalizationFilterFactory.java  |   4 +-
 .../TestSerbianNormalizationRegularFilter.java  |   4 +-
 .../analysis/standard/TestClassicAnalyzer.java  |   4 +-
 .../analysis/standard/TestStandardAnalyzer.java |   4 +-
 .../standard/TestStandardFactories.java         |   4 +-
 .../standard/TestUAX29URLEmailAnalyzer.java     |   4 +-
 .../standard/TestUAX29URLEmailTokenizer.java    |  32 +-
 .../TestUAX29URLEmailTokenizerFactory.java      |   4 +-
 .../standard/WordBreakTestUnicode_6_3_0.java    |   4 +-
 .../lucene/analysis/sv/TestSwedishAnalyzer.java |   4 +-
 .../analysis/sv/TestSwedishLightStemFilter.java |   4 +-
 .../sv/TestSwedishLightStemFilterFactory.java   |   4 +-
 .../synonym/BaseSynonymParserTestCase.java      |   4 +-
 .../analysis/synonym/TestMultiWordSynonyms.java |   4 +-
 .../analysis/synonym/TestSolrSynonymParser.java |   4 +-
 .../synonym/TestSynonymFilterFactory.java       |   4 +-
 .../analysis/synonym/TestSynonymMapFilter.java  |   1 -
 .../synonym/TestWordnetSynonymParser.java       |   1 -
 .../lucene/analysis/th/TestThaiAnalyzer.java    |   4 +-
 .../analysis/th/TestThaiTokenizerFactory.java   |   4 +-
 .../analysis/tr/TestApostropheFilter.java       |   4 +-
 .../tr/TestApostropheFilterFactory.java         |   4 +-
 .../lucene/analysis/tr/TestTurkishAnalyzer.java |   4 +-
 .../analysis/tr/TestTurkishLowerCaseFilter.java |   4 +-
 .../tr/TestTurkishLowerCaseFilterFactory.java   |   4 +-
 .../util/BaseTokenStreamFactoryTestCase.java    |   4 +-
 .../analysis/util/StringMockResourceLoader.java |   4 +-
 .../analysis/util/TestAnalysisSPILoader.java    |   4 +-
 .../analysis/util/TestCharArrayIterator.java    |   4 +-
 .../lucene/analysis/util/TestCharArrayMap.java  |   1 -
 .../lucene/analysis/util/TestCharArraySet.java  |   4 +-
 .../analysis/util/TestCharTokenizers.java       |   4 +-
 .../analysis/util/TestCharacterUtils.java       |   4 +-
 .../lucene/analysis/util/TestElision.java       |   4 +-
 .../analysis/util/TestElisionFilterFactory.java |   4 +-
 .../util/TestFilesystemResourceLoader.java      |  32 +-
 .../analysis/util/TestRollingCharBuffer.java    |   4 +-
 .../util/TestSegmentingTokenizerBase.java       |   4 +-
 .../analysis/util/TestWordlistLoader.java       |   4 +-
 .../TestWikipediaTokenizerFactory.java          |   4 +-
 .../wikipedia/WikipediaTokenizerTest.java       |   1 -
 .../collation/TestCollationDocValuesField.java  |   4 +-
 .../collation/TestCollationKeyAnalyzer.java     |   4 +-
 .../standard/GenerateJflexTLDMacros.java        |  16 +-
 .../lucene/analysis/icu/ICUFoldingFilter.java   |   4 +-
 .../analysis/icu/ICUFoldingFilterFactory.java   |   4 +-
 .../analysis/icu/ICUNormalizer2CharFilter.java  |   4 +-
 .../icu/ICUNormalizer2CharFilterFactory.java    |   4 +-
 .../analysis/icu/ICUNormalizer2Filter.java      |   4 +-
 .../icu/ICUNormalizer2FilterFactory.java        |   4 +-
 .../lucene/analysis/icu/ICUTransformFilter.java |   4 +-
 .../analysis/icu/ICUTransformFilterFactory.java |   4 +-
 .../icu/segmentation/BreakIteratorWrapper.java  |   4 +-
 .../icu/segmentation/CharArrayIterator.java     |   4 +-
 .../segmentation/CompositeBreakIterator.java    |   4 +-
 .../segmentation/DefaultICUTokenizerConfig.java |   4 +-
 .../analysis/icu/segmentation/ICUTokenizer.java |   4 +-
 .../icu/segmentation/ICUTokenizerConfig.java    |   4 +-
 .../icu/segmentation/ICUTokenizerFactory.java   |   4 +-
 .../icu/segmentation/ScriptIterator.java        |   3 +-
 .../icu/tokenattributes/ScriptAttribute.java    |   4 +-
 .../tokenattributes/ScriptAttributeImpl.java    |   4 +-
 .../collation/ICUCollationAttributeFactory.java |   4 +-
 .../collation/ICUCollationDocValuesField.java   |   4 +-
 .../collation/ICUCollationKeyAnalyzer.java      |   4 +-
 .../ICUCollatedTermAttributeImpl.java           |   4 +-
 .../analysis/icu/TestICUFoldingFilter.java      |   4 +-
 .../icu/TestICUFoldingFilterFactory.java        |   4 +-
 .../icu/TestICUNormalizer2CharFilter.java       |   4 +-
 .../TestICUNormalizer2CharFilterFactory.java    |   4 +-
 .../analysis/icu/TestICUNormalizer2Filter.java  |   4 +-
 .../icu/TestICUNormalizer2FilterFactory.java    |   4 +-
 .../analysis/icu/TestICUTransformFilter.java    |   4 +-
 .../icu/TestICUTransformFilterFactory.java      |   4 +-
 .../icu/segmentation/TestCharArrayIterator.java |   4 +-
 .../icu/segmentation/TestICUTokenizer.java      |   4 +-
 .../icu/segmentation/TestICUTokenizerCJK.java   |   4 +-
 .../segmentation/TestICUTokenizerFactory.java   |   4 +-
 .../segmentation/TestWithCJKBigramFilter.java   |   4 +-
 .../TestICUCollationDocValuesField.java         |   4 +-
 .../collation/TestICUCollationKeyAnalyzer.java  |   4 +-
 .../analysis/icu/GenerateUTR30DataFiles.java    |   4 +-
 .../lucene/analysis/icu/RBBIRuleCompiler.java   |   4 +-
 .../lucene/analysis/ja/GraphvizFormatter.java   |   4 +-
 .../lucene/analysis/ja/JapaneseAnalyzer.java    |   4 +-
 .../analysis/ja/JapaneseBaseFormFilter.java     |   4 +-
 .../ja/JapaneseBaseFormFilterFactory.java       |   4 +-
 .../ja/JapaneseIterationMarkCharFilter.java     |   4 +-
 .../JapaneseIterationMarkCharFilterFactory.java |   4 +-
 .../analysis/ja/JapaneseKatakanaStemFilter.java |   4 +-
 .../ja/JapaneseKatakanaStemFilterFactory.java   |   4 +-
 .../analysis/ja/JapaneseNumberFilter.java       |   4 +-
 .../ja/JapaneseNumberFilterFactory.java         |   4 +-
 .../ja/JapanesePartOfSpeechStopFilter.java      |   4 +-
 .../JapanesePartOfSpeechStopFilterFactory.java  |   4 +-
 .../analysis/ja/JapaneseReadingFormFilter.java  |   4 +-
 .../ja/JapaneseReadingFormFilterFactory.java    |   4 +-
 .../lucene/analysis/ja/JapaneseTokenizer.java   |   4 +-
 .../analysis/ja/JapaneseTokenizerFactory.java   |   4 +-
 .../org/apache/lucene/analysis/ja/Token.java    |   4 +-
 .../analysis/ja/dict/BinaryDictionary.java      |   4 +-
 .../analysis/ja/dict/CharacterDefinition.java   |   4 +-
 .../analysis/ja/dict/ConnectionCosts.java       |   4 +-
 .../lucene/analysis/ja/dict/Dictionary.java     |   4 +-
 .../analysis/ja/dict/TokenInfoDictionary.java   |   4 +-
 .../lucene/analysis/ja/dict/TokenInfoFST.java   |   4 +-
 .../analysis/ja/dict/UnknownDictionary.java     |   4 +-
 .../lucene/analysis/ja/dict/UserDictionary.java |   4 +-
 .../ja/tokenattributes/BaseFormAttribute.java   |   4 +-
 .../tokenattributes/BaseFormAttributeImpl.java  |   4 +-
 .../ja/tokenattributes/InflectionAttribute.java |   4 +-
 .../InflectionAttributeImpl.java                |   4 +-
 .../tokenattributes/PartOfSpeechAttribute.java  |   4 +-
 .../PartOfSpeechAttributeImpl.java              |   4 +-
 .../ja/tokenattributes/ReadingAttribute.java    |   4 +-
 .../tokenattributes/ReadingAttributeImpl.java   |   4 +-
 .../apache/lucene/analysis/ja/util/CSVUtil.java |   4 +-
 .../lucene/analysis/ja/util/ToStringUtil.java   |   4 +-
 .../analysis/ja/StringMockResourceLoader.java   |   4 +-
 .../lucene/analysis/ja/TestExtendedMode.java    |   4 +-
 .../analysis/ja/TestJapaneseAnalyzer.java       |   4 +-
 .../analysis/ja/TestJapaneseBaseFormFilter.java |   4 +-
 .../ja/TestJapaneseBaseFormFilterFactory.java   |   4 +-
 .../ja/TestJapaneseIterationMarkCharFilter.java |   4 +-
 ...tJapaneseIterationMarkCharFilterFactory.java |   4 +-
 .../ja/TestJapaneseKatakanaStemFilter.java      |   4 +-
 .../TestJapaneseKatakanaStemFilterFactory.java  |   4 +-
 .../analysis/ja/TestJapaneseNumberFilter.java   |   4 +-
 .../ja/TestJapaneseNumberFilterFactory.java     |   4 +-
 ...stJapanesePartOfSpeechStopFilterFactory.java |   4 +-
 .../ja/TestJapaneseReadingFormFilter.java       |   4 +-
 .../TestJapaneseReadingFormFilterFactory.java   |   4 +-
 .../analysis/ja/TestJapaneseTokenizer.java      |   4 +-
 .../ja/TestJapaneseTokenizerFactory.java        |   4 +-
 .../lucene/analysis/ja/TestSearchMode.java      |   4 +-
 .../ja/dict/TestTokenInfoDictionary.java        |   4 +-
 .../analysis/ja/dict/UserDictionaryTest.java    |   4 +-
 .../analysis/ja/util/TestToStringUtil.java      |   4 +-
 .../ja/util/BinaryDictionaryWriter.java         |   4 +-
 .../ja/util/CharacterDefinitionWriter.java      |   4 +-
 .../ja/util/ConnectionCostsBuilder.java         |   4 +-
 .../analysis/ja/util/ConnectionCostsWriter.java |   4 +-
 .../analysis/ja/util/DictionaryBuilder.java     |   4 +-
 .../ja/util/TokenInfoDictionaryBuilder.java     |   4 +-
 .../ja/util/TokenInfoDictionaryWriter.java      |   4 +-
 .../ja/util/UnknownDictionaryBuilder.java       |   4 +-
 .../ja/util/UnknownDictionaryWriter.java        |   4 +-
 .../analysis/ja/dict/UnknownDictionaryTest.java |   4 +-
 .../analysis/morfologik/MorfologikAnalyzer.java |   3 +-
 .../analysis/morfologik/MorfologikFilter.java   |   4 +-
 .../morfologik/MorfologikFilterFactory.java     |   4 +-
 .../MorphosyntacticTagsAttribute.java           |   3 +-
 .../MorphosyntacticTagsAttributeImpl.java       |   3 +-
 .../morfologik/TestMorfologikAnalyzer.java      |   4 +-
 .../morfologik/TestMorfologikFilterFactory.java |   4 +-
 .../analysis/phonetic/BeiderMorseFilter.java    |   4 +-
 .../phonetic/BeiderMorseFilterFactory.java      |   4 +-
 .../phonetic/DaitchMokotoffSoundexFilter.java   |   2 +-
 .../DaitchMokotoffSoundexFilterFactory.java     |   2 +-
 .../phonetic/DoubleMetaphoneFilterFactory.java  |   4 +-
 .../analysis/phonetic/PhoneticFilter.java       |   1 -
 .../phonetic/PhoneticFilterFactory.java         |   4 +-
 .../phonetic/TestBeiderMorseFilter.java         |   4 +-
 .../phonetic/TestBeiderMorseFilterFactory.java  |   4 +-
 .../TestDaitchMokotoffSoundexFilter.java        |   2 +-
 .../TestDaitchMokotoffSoundexFilterFactory.java |   4 +-
 .../TestDoubleMetaphoneFilterFactory.java       |   4 +-
 .../analysis/phonetic/TestPhoneticFilter.java   |   1 -
 .../phonetic/TestPhoneticFilterFactory.java     |   4 +-
 .../analysis/cn/smart/AnalyzerProfile.java      |   1 -
 .../lucene/analysis/cn/smart/CharType.java      |   1 -
 .../analysis/cn/smart/HMMChineseTokenizer.java  |   4 +-
 .../cn/smart/HMMChineseTokenizerFactory.java    |   1 -
 .../analysis/cn/smart/SmartChineseAnalyzer.java |   1 -
 .../lucene/analysis/cn/smart/Utility.java       |   1 -
 .../lucene/analysis/cn/smart/WordSegmenter.java |   1 -
 .../lucene/analysis/cn/smart/WordType.java      |   1 -
 .../cn/smart/hhmm/AbstractDictionary.java       |   1 -
 .../analysis/cn/smart/hhmm/BiSegGraph.java      |   1 -
 .../cn/smart/hhmm/BigramDictionary.java         |   1 -
 .../analysis/cn/smart/hhmm/HHMMSegmenter.java   |   1 -
 .../lucene/analysis/cn/smart/hhmm/PathNode.java |   1 -
 .../lucene/analysis/cn/smart/hhmm/SegGraph.java |   1 -
 .../lucene/analysis/cn/smart/hhmm/SegToken.java |   1 -
 .../analysis/cn/smart/hhmm/SegTokenFilter.java  |   1 -
 .../analysis/cn/smart/hhmm/SegTokenPair.java    |   1 -
 .../analysis/cn/smart/hhmm/WordDictionary.java  |   1 -
 .../smart/TestHMMChineseTokenizerFactory.java   |   4 +-
 .../cn/smart/TestSmartChineseAnalyzer.java      |   1 -
 .../lucene/analysis/pl/PolishAnalyzer.java      |   4 +-
 .../lucene/analysis/stempel/StempelFilter.java  |  26 +-
 .../stempel/StempelPolishStemFilterFactory.java |   4 +-
 .../lucene/analysis/stempel/StempelStemmer.java |  26 +-
 .../lucene/analysis/pl/TestPolishAnalyzer.java  |   4 +-
 .../TestStempelPolishStemFilterFactory.java     |   4 +-
 .../lucene/analysis/uima/BaseUIMATokenizer.java |   4 +-
 .../analysis/uima/UIMAAnnotationsTokenizer.java |   4 +-
 .../uima/UIMAAnnotationsTokenizerFactory.java   |   4 +-
 .../lucene/analysis/uima/UIMABaseAnalyzer.java  |   4 +-
 .../analysis/uima/UIMATypeAwareAnalyzer.java    |   4 +-
 .../uima/UIMATypeAwareAnnotationsTokenizer.java |   4 +-
 ...IMATypeAwareAnnotationsTokenizerFactory.java |   4 +-
 .../lucene/analysis/uima/ae/AEProvider.java     |   4 +-
 .../analysis/uima/ae/AEProviderFactory.java     |   4 +-
 .../analysis/uima/ae/BasicAEProvider.java       |   4 +-
 .../uima/ae/OverridingParamsAEProvider.java     |   4 +-
 .../analysis/uima/UIMABaseAnalyzerTest.java     |   4 +-
 .../uima/UIMATypeAwareAnalyzerTest.java         |   4 +-
 .../analysis/uima/ae/AEProviderFactoryTest.java |   4 +-
 .../analysis/uima/ae/BasicAEProviderTest.java   |   4 +-
 .../uima/ae/OverridingParamsAEProviderTest.java |   4 +-
 .../analysis/uima/an/SampleEntityAnnotator.java |   4 +-
 .../analysis/uima/an/SamplePoSTagger.java       |   4 +-
 .../uima/an/SampleWSTokenizerAnnotator.java     |   4 +-
 .../org/apache/lucene/codecs/Placeholder.java   |   4 +-
 .../lucene/codecs/lucene50/Lucene50Codec.java   |   4 +-
 .../lucene50/Lucene50DocValuesConsumer.java     |   4 +-
 .../lucene50/Lucene50DocValuesFormat.java       |   4 +-
 .../lucene50/Lucene50DocValuesProducer.java     |   4 +-
 .../codecs/lucene50/Lucene50NormsFormat.java    |   4 +-
 .../codecs/lucene50/Lucene50NormsProducer.java  |   4 +-
 .../lucene/codecs/lucene53/Lucene53Codec.java   |   4 +-
 .../lucene/codecs/lucene54/Lucene54Codec.java   |   4 +-
 .../codecs/lucene50/Lucene50NormsConsumer.java  |   4 +-
 .../lucene/codecs/lucene50/Lucene50RWCodec.java |   4 +-
 .../codecs/lucene50/Lucene50RWNormsFormat.java  |   4 +-
 .../lucene50/TestLucene50DocValuesFormat.java   |   4 +-
 .../lucene50/TestLucene50NormsFormat.java       |   4 +-
 .../index/TestBackwardsCompatibility.java       |  12 +-
 .../lucene/index/TestMaxPositionInOldIndex.java |   4 +-
 lucene/benchmark/.gitignore                     |   2 +
 .../org/apache/lucene/benchmark/Constants.java  |  19 +-
 .../lucene/benchmark/byTask/Benchmark.java      |   4 +-
 .../lucene/benchmark/byTask/PerfRunData.java    |   4 +-
 .../byTask/feeds/AbstractQueryMaker.java        |  13 +-
 .../byTask/feeds/ContentItemsSource.java        |   4 +-
 .../benchmark/byTask/feeds/ContentSource.java   |   4 +-
 .../benchmark/byTask/feeds/DemoHTMLParser.java  |   4 +-
 .../byTask/feeds/DirContentSource.java          |   4 +-
 .../lucene/benchmark/byTask/feeds/DocData.java  |   4 +-
 .../lucene/benchmark/byTask/feeds/DocMaker.java |   4 +-
 .../byTask/feeds/EnwikiContentSource.java       |   4 +-
 .../byTask/feeds/EnwikiQueryMaker.java          |   4 +-
 .../benchmark/byTask/feeds/FacetSource.java     |   4 +-
 .../byTask/feeds/FileBasedQueryMaker.java       |  18 +-
 .../byTask/feeds/GeonamesLineParser.java        |   4 +-
 .../benchmark/byTask/feeds/HTMLParser.java      |   4 +-
 .../benchmark/byTask/feeds/LineDocSource.java   |   4 +-
 .../feeds/LongToEnglishContentSource.java       |   4 +-
 .../byTask/feeds/LongToEnglishQueryMaker.java   |   4 +-
 .../byTask/feeds/NoMoreDataException.java       |   4 +-
 .../benchmark/byTask/feeds/QueryMaker.java      |   4 +-
 .../byTask/feeds/RandomFacetSource.java         |   4 +-
 .../byTask/feeds/ReutersContentSource.java      |   4 +-
 .../byTask/feeds/ReutersQueryMaker.java         |   4 +-
 .../byTask/feeds/SimpleQueryMaker.java          |   4 +-
 .../feeds/SimpleSloppyPhraseQueryMaker.java     |   4 +-
 .../benchmark/byTask/feeds/SingleDocSource.java |   8 +-
 .../byTask/feeds/SortableSingleDocSource.java   |   4 +-
 .../benchmark/byTask/feeds/SpatialDocMaker.java |   4 +-
 .../byTask/feeds/SpatialFileQueryMaker.java     |   4 +-
 .../byTask/feeds/TrecContentSource.java         |   4 +-
 .../benchmark/byTask/feeds/TrecDocParser.java   |   4 +-
 .../benchmark/byTask/feeds/TrecFBISParser.java  |   4 +-
 .../benchmark/byTask/feeds/TrecFR94Parser.java  |   4 +-
 .../benchmark/byTask/feeds/TrecFTParser.java    |   4 +-
 .../benchmark/byTask/feeds/TrecGov2Parser.java  |   4 +-
 .../byTask/feeds/TrecLATimesParser.java         |   4 +-
 .../byTask/feeds/TrecParserByPath.java          |   4 +-
 .../benchmark/byTask/programmatic/Sample.java   |  15 +-
 .../lucene/benchmark/byTask/stats/Points.java   |   4 +-
 .../lucene/benchmark/byTask/stats/Report.java   |   4 +-
 .../benchmark/byTask/stats/TaskStats.java       |   4 +-
 .../benchmark/byTask/tasks/AddDocTask.java      |   4 +-
 .../byTask/tasks/AddFacetedDocTask.java         |   4 +-
 .../benchmark/byTask/tasks/AddIndexesTask.java  |   4 +-
 .../byTask/tasks/AnalyzerFactoryTask.java       |   4 +-
 .../byTask/tasks/BenchmarkHighlighter.java      |   4 +-
 .../benchmark/byTask/tasks/ClearStatsTask.java  |   8 +-
 .../benchmark/byTask/tasks/CloseIndexTask.java  |   4 +-
 .../benchmark/byTask/tasks/CloseReaderTask.java |   4 +-
 .../byTask/tasks/CloseTaxonomyIndexTask.java    |   4 +-
 .../byTask/tasks/CloseTaxonomyReaderTask.java   |   4 +-
 .../benchmark/byTask/tasks/CommitIndexTask.java |   4 +-
 .../byTask/tasks/CommitTaxonomyIndexTask.java   |   2 +-
 .../byTask/tasks/ConsumeContentSourceTask.java  |   4 +-
 .../benchmark/byTask/tasks/CreateIndexTask.java |   4 +-
 .../byTask/tasks/CreateTaxonomyIndexTask.java   |   4 +-
 .../benchmark/byTask/tasks/ForceMergeTask.java  |   4 +-
 .../byTask/tasks/NearRealtimeReaderTask.java    |   4 +-
 .../benchmark/byTask/tasks/NewAnalyzerTask.java |  13 +-
 .../byTask/tasks/NewCollationAnalyzerTask.java  |   4 +-
 .../benchmark/byTask/tasks/NewLocaleTask.java   |   4 +-
 .../benchmark/byTask/tasks/NewRoundTask.java    |   8 +-
 .../benchmark/byTask/tasks/OpenIndexTask.java   |   4 +-
 .../benchmark/byTask/tasks/OpenReaderTask.java  |   4 +-
 .../byTask/tasks/OpenTaxonomyIndexTask.java     |   4 +-
 .../byTask/tasks/OpenTaxonomyReaderTask.java    |   4 +-
 .../lucene/benchmark/byTask/tasks/PerfTask.java |   4 +-
 .../benchmark/byTask/tasks/PrintReaderTask.java |   4 +-
 .../lucene/benchmark/byTask/tasks/ReadTask.java |   4 +-
 .../benchmark/byTask/tasks/ReadTokensTask.java  |   4 +-
 .../byTask/tasks/ReopenReaderTask.java          |   2 +-
 .../benchmark/byTask/tasks/RepAllTask.java      |   4 +-
 .../byTask/tasks/RepSelectByPrefTask.java       |   4 +-
 .../byTask/tasks/RepSumByNameRoundTask.java     |   4 +-
 .../byTask/tasks/RepSumByNameTask.java          |   4 +-
 .../byTask/tasks/RepSumByPrefRoundTask.java     |   4 +-
 .../byTask/tasks/RepSumByPrefTask.java          |   4 +-
 .../benchmark/byTask/tasks/ReportTask.java      |  18 +-
 .../benchmark/byTask/tasks/ResetInputsTask.java |   8 +-
 .../byTask/tasks/ResetSystemEraseTask.java      |   8 +-
 .../byTask/tasks/ResetSystemSoftTask.java       |   8 +-
 .../byTask/tasks/RollbackIndexTask.java         |   4 +-
 .../benchmark/byTask/tasks/SearchTask.java      |   4 +-
 .../tasks/SearchTravRetHighlightTask.java       |   4 +-
 .../SearchTravRetLoadFieldSelectorTask.java     |  14 +-
 .../byTask/tasks/SearchTravRetTask.java         |   4 +-
 .../tasks/SearchTravRetVectorHighlightTask.java |   4 +-
 .../benchmark/byTask/tasks/SearchTravTask.java  |   4 +-
 .../byTask/tasks/SearchWithCollectorTask.java   |   2 +-
 .../byTask/tasks/SearchWithSortTask.java        |   2 +-
 .../benchmark/byTask/tasks/SetPropTask.java     |   8 +-
 .../benchmark/byTask/tasks/TaskSequence.java    |   4 +-
 .../benchmark/byTask/tasks/UpdateDocTask.java   |   4 +-
 .../lucene/benchmark/byTask/tasks/WaitTask.java |   4 +-
 .../lucene/benchmark/byTask/tasks/WarmTask.java |   4 +-
 .../byTask/tasks/WriteEnwikiLineDocTask.java    |  32 +-
 .../byTask/tasks/WriteLineDocTask.java          |   4 +-
 .../benchmark/byTask/utils/Algorithm.java       |   4 +-
 .../benchmark/byTask/utils/AnalyzerFactory.java |   4 +-
 .../lucene/benchmark/byTask/utils/Config.java   |   4 +-
 .../lucene/benchmark/byTask/utils/Format.java   |   4 +-
 .../benchmark/byTask/utils/StreamUtils.java     |   4 +-
 .../benchmark/quality/trec/QueryDriver.java     |   4 +-
 .../lucene/benchmark/utils/ExtractReuters.java  |  15 +-
 .../benchmark/utils/ExtractWikipedia.java       |   4 +-
 lucene/benchmark/src/test/conf/ConfLoader.java  |   3 +-
 .../lucene/benchmark/BenchmarkTestCase.java     |   4 +-
 .../benchmark/byTask/TestPerfTasksLogic.java    |   3 -
 .../benchmark/byTask/TestPerfTasksParse.java    |   1 -
 .../benchmark/byTask/feeds/DocMakerTest.java    |   4 +-
 .../byTask/feeds/EnwikiContentSourceTest.java   |   4 +-
 .../byTask/feeds/LineDocSourceTest.java         |   4 +-
 .../benchmark/byTask/feeds/TestHtmlParser.java  |   4 +-
 .../byTask/feeds/TrecContentSourceTest.java     |   4 +-
 .../byTask/tasks/AddIndexesTaskTest.java        |   4 +-
 .../byTask/tasks/CommitIndexTaskTest.java       |   4 +-
 .../tasks/CountingHighlighterTestTask.java      |   1 -
 .../byTask/tasks/CountingSearchTestTask.java    |   1 -
 .../byTask/tasks/CreateIndexTaskTest.java       |   4 +-
 .../benchmark/byTask/tasks/PerfTaskTest.java    |   4 +-
 .../byTask/tasks/SearchWithSortTaskTest.java    |   4 +-
 .../tasks/WriteEnwikiLineDocTaskTest.java       |   4 +-
 .../byTask/tasks/WriteLineDocTaskTest.java      |   4 +-
 .../byTask/tasks/alt/AltPackageTaskTest.java    |   4 +-
 .../benchmark/byTask/tasks/alt/AltTestTask.java |   4 +-
 .../benchmark/byTask/utils/StreamUtilsTest.java |  18 +-
 .../benchmark/byTask/utils/TestConfig.java      |   4 +-
 .../benchmark/quality/TestQualityRun.java       |   4 +-
 .../CachingNaiveBayesClassifier.java            |  32 +-
 .../document/DocumentClassifier.java            |   4 +-
 .../KNearestNeighborDocumentClassifier.java     |   4 +-
 .../SimpleNaiveBayesDocumentClassifier.java     |   4 +-
 .../utils/ConfusionMatrixGenerator.java         |   4 +-
 .../classification/utils/DatasetSplitter.java   |   4 +-
 .../CachingNaiveBayesClassifierTest.java        |   4 +-
 .../DocumentClassificationTestBase.java         |   4 +-
 .../KNearestNeighborDocumentClassifierTest.java |   4 +-
 .../SimpleNaiveBayesDocumentClassifierTest.java |   4 +-
 .../utils/ConfusionMatrixGeneratorTest.java     |   4 +-
 .../classification/utils/DataSplitterTest.java  |   4 +-
 .../autoprefix/AutoPrefixPostingsFormat.java    |   4 +-
 .../codecs/blockterms/BlockTermsReader.java     |   4 +-
 .../codecs/blockterms/BlockTermsWriter.java     |   4 +-
 .../blockterms/FixedGapTermsIndexReader.java    |   4 +-
 .../blockterms/FixedGapTermsIndexWriter.java    |   4 +-
 .../codecs/blockterms/TermsIndexReaderBase.java |   4 +-
 .../codecs/blockterms/TermsIndexWriterBase.java |   4 +-
 .../blockterms/VariableGapTermsIndexReader.java |   4 +-
 .../blockterms/VariableGapTermsIndexWriter.java |   4 +-
 .../BlockTreeOrdsPostingsFormat.java            |   4 +-
 .../codecs/blocktreeords/FSTOrdsOutputs.java    |   4 +-
 .../blocktreeords/OrdsBlockTreeTermsReader.java |   4 +-
 .../blocktreeords/OrdsBlockTreeTermsWriter.java |   4 +-
 .../codecs/blocktreeords/OrdsFieldReader.java   |   4 +-
 .../blocktreeords/OrdsIntersectTermsEnum.java   |   4 +-
 .../OrdsIntersectTermsEnumFrame.java            |   4 +-
 .../blocktreeords/OrdsSegmentTermsEnum.java     |   4 +-
 .../OrdsSegmentTermsEnumFrame.java              |   4 +-
 .../lucene/codecs/bloom/BloomFilterFactory.java |   2 +-
 .../bloom/BloomFilteringPostingsFormat.java     |   4 +-
 .../codecs/bloom/DefaultBloomFilterFactory.java |   2 +-
 .../apache/lucene/codecs/bloom/FuzzySet.java    |   4 +-
 .../lucene/codecs/bloom/HashFunction.java       |   2 +-
 .../apache/lucene/codecs/bloom/MurmurHash2.java |   2 +-
 .../codecs/memory/DirectDocValuesConsumer.java  |   4 +-
 .../codecs/memory/DirectDocValuesFormat.java    |   4 +-
 .../codecs/memory/DirectDocValuesProducer.java  |   4 +-
 .../codecs/memory/DirectPostingsFormat.java     |   4 +-
 .../codecs/memory/FSTOrdPostingsFormat.java     |   6 +-
 .../lucene/codecs/memory/FSTOrdTermsReader.java |   4 +-
 .../lucene/codecs/memory/FSTOrdTermsWriter.java |   4 +-
 .../lucene/codecs/memory/FSTPostingsFormat.java |   6 +-
 .../lucene/codecs/memory/FSTTermOutputs.java    |   4 +-
 .../lucene/codecs/memory/FSTTermsReader.java    |   4 +-
 .../lucene/codecs/memory/FSTTermsWriter.java    |   4 +-
 .../codecs/memory/MemoryDocValuesConsumer.java  |   4 +-
 .../codecs/memory/MemoryDocValuesFormat.java    |   4 +-
 .../codecs/memory/MemoryDocValuesProducer.java  |   4 +-
 .../codecs/memory/MemoryPostingsFormat.java     |   4 +-
 .../codecs/simpletext/SimpleTextBKDReader.java  |   4 +-
 .../codecs/simpletext/SimpleTextCodec.java      |   4 +-
 .../simpletext/SimpleTextCompoundFormat.java    |   4 +-
 .../simpletext/SimpleTextDocValuesFormat.java   |   4 +-
 .../simpletext/SimpleTextDocValuesReader.java   |   4 +-
 .../simpletext/SimpleTextDocValuesWriter.java   |   4 +-
 .../simpletext/SimpleTextFieldInfosFormat.java  |   4 +-
 .../simpletext/SimpleTextFieldsReader.java      |   4 +-
 .../simpletext/SimpleTextFieldsWriter.java      |   4 +-
 .../simpletext/SimpleTextLiveDocsFormat.java    |   4 +-
 .../simpletext/SimpleTextNormsFormat.java       |   4 +-
 .../simpletext/SimpleTextPointFormat.java       |   4 +-
 .../simpletext/SimpleTextPointReader.java       |  28 +-
 .../simpletext/SimpleTextPointWriter.java       |  47 +-
 .../simpletext/SimpleTextPostingsFormat.java    |   4 +-
 .../simpletext/SimpleTextSegmentInfoFormat.java |   4 +-
 .../SimpleTextStoredFieldsFormat.java           |   4 +-
 .../SimpleTextStoredFieldsReader.java           |   4 +-
 .../SimpleTextStoredFieldsWriter.java           |   4 +-
 .../simpletext/SimpleTextTermVectorsFormat.java |   4 +-
 .../simpletext/SimpleTextTermVectorsReader.java |   4 +-
 .../simpletext/SimpleTextTermVectorsWriter.java |   4 +-
 .../codecs/simpletext/SimpleTextUtil.java       |   4 +-
 .../TestAutoPrefixPostingsFormat.java           |   4 +-
 .../codecs/autoprefix/TestAutoPrefixTerms.java  |   4 +-
 .../blockterms/TestFixedGapPostingsFormat.java  |   4 +-
 ...TestVarGapDocFreqIntervalPostingsFormat.java |   4 +-
 .../TestVarGapFixedIntervalPostingsFormat.java  |   4 +-
 .../codecs/blocktreeords/TestOrdsBlockTree.java |   4 +-
 .../codecs/bloom/TestBloomPostingsFormat.java   |   4 +-
 .../memory/TestDirectDocValuesFormat.java       |   4 +-
 .../codecs/memory/TestDirectPostingsFormat.java |   4 +-
 .../codecs/memory/TestFSTOrdPostingsFormat.java |   4 +-
 .../codecs/memory/TestFSTPostingsFormat.java    |   4 +-
 .../memory/TestMemoryDocValuesFormat.java       |   4 +-
 .../codecs/memory/TestMemoryPostingsFormat.java |   4 +-
 .../TestSimpleTextCompoundFormat.java           |   4 +-
 .../TestSimpleTextDocValuesFormat.java          |   4 +-
 .../TestSimpleTextFieldInfoFormat.java          |   4 +-
 .../simpletext/TestSimpleTextNormsFormat.java   |   4 +-
 .../simpletext/TestSimpleTextPointFormat.java   |  33 +
 .../TestSimpleTextPostingsFormat.java           |   4 +-
 .../TestSimpleTextSegmentInfoFormat.java        |   4 +-
 .../TestSimpleTextStoredFieldsFormat.java       |   4 +-
 .../TestSimpleTextTermVectorsFormat.java        |   4 +-
 lucene/common-build.xml                         |  35 +-
 .../java/org/apache/lucene/LucenePackage.java   |   4 +-
 .../org/apache/lucene/analysis/Analyzer.java    |   4 +-
 .../apache/lucene/analysis/AnalyzerWrapper.java |   4 +-
 .../lucene/analysis/CachingTokenFilter.java     |   4 +-
 .../org/apache/lucene/analysis/CharFilter.java  |   4 +-
 .../analysis/DelegatingAnalyzerWrapper.java     |   8 +-
 .../analysis/LegacyNumericTokenStream.java      |   4 +-
 .../lucene/analysis/ReusableStringReader.java   |   8 +-
 .../java/org/apache/lucene/analysis/Token.java  |   4 +-
 .../org/apache/lucene/analysis/TokenFilter.java |   4 +-
 .../org/apache/lucene/analysis/TokenStream.java |   4 +-
 .../lucene/analysis/TokenStreamToAutomaton.java |   4 +-
 .../org/apache/lucene/analysis/Tokenizer.java   |   4 +-
 .../tokenattributes/BytesTermAttribute.java     |   4 +-
 .../tokenattributes/BytesTermAttributeImpl.java |   4 +-
 .../tokenattributes/CharTermAttribute.java      |   4 +-
 .../tokenattributes/CharTermAttributeImpl.java  |   4 +-
 .../tokenattributes/FlagsAttribute.java         |   4 +-
 .../tokenattributes/FlagsAttributeImpl.java     |   4 +-
 .../tokenattributes/KeywordAttribute.java       |   4 +-
 .../tokenattributes/KeywordAttributeImpl.java   |   4 +-
 .../tokenattributes/OffsetAttribute.java        |   4 +-
 .../tokenattributes/OffsetAttributeImpl.java    |   4 +-
 .../PackedTokenAttributeImpl.java               |   4 +-
 .../tokenattributes/PayloadAttribute.java       |   4 +-
 .../tokenattributes/PayloadAttributeImpl.java   |   4 +-
 .../PositionIncrementAttribute.java             |   4 +-
 .../PositionIncrementAttributeImpl.java         |   4 +-
 .../PositionLengthAttribute.java                |   4 +-
 .../PositionLengthAttributeImpl.java            |   4 +-
 .../TermToBytesRefAttribute.java                |   4 +-
 .../analysis/tokenattributes/TypeAttribute.java |   4 +-
 .../tokenattributes/TypeAttributeImpl.java      |   4 +-
 .../apache/lucene/codecs/BlockTermState.java    |   2 +-
 .../java/org/apache/lucene/codecs/Codec.java    |   4 +-
 .../org/apache/lucene/codecs/CodecUtil.java     |   6 +-
 .../apache/lucene/codecs/CompoundFormat.java    |   4 +-
 .../apache/lucene/codecs/DocValuesConsumer.java |   4 +-
 .../apache/lucene/codecs/DocValuesFormat.java   |   4 +-
 .../apache/lucene/codecs/DocValuesProducer.java |   4 +-
 .../apache/lucene/codecs/FieldInfosFormat.java  |   4 +-
 .../apache/lucene/codecs/FieldsConsumer.java    |   4 +-
 .../apache/lucene/codecs/FieldsProducer.java    |   4 +-
 .../org/apache/lucene/codecs/FilterCodec.java   |   4 +-
 .../apache/lucene/codecs/LiveDocsFormat.java    |   4 +-
 .../lucene/codecs/MultiLevelSkipListReader.java |   4 +-
 .../lucene/codecs/MultiLevelSkipListWriter.java |   4 +-
 .../org/apache/lucene/codecs/NormsConsumer.java |   4 +-
 .../org/apache/lucene/codecs/NormsFormat.java   |   4 +-
 .../org/apache/lucene/codecs/NormsProducer.java |  18 +-
 .../org/apache/lucene/codecs/PointFormat.java   |   4 +-
 .../org/apache/lucene/codecs/PointReader.java   |   4 +-
 .../org/apache/lucene/codecs/PointWriter.java   |   8 +-
 .../apache/lucene/codecs/PostingsFormat.java    |   4 +-
 .../lucene/codecs/PostingsReaderBase.java       |   4 +-
 .../lucene/codecs/PostingsWriterBase.java       |   4 +-
 .../lucene/codecs/PushPostingsWriterBase.java   |   4 +-
 .../apache/lucene/codecs/SegmentInfoFormat.java |   4 +-
 .../lucene/codecs/StoredFieldsFormat.java       |   4 +-
 .../lucene/codecs/StoredFieldsReader.java       |  24 +-
 .../lucene/codecs/StoredFieldsWriter.java       |  26 +-
 .../org/apache/lucene/codecs/TermStats.java     |   4 +-
 .../apache/lucene/codecs/TermVectorsFormat.java |   4 +-
 .../apache/lucene/codecs/TermVectorsReader.java |   4 +-
 .../apache/lucene/codecs/TermVectorsWriter.java |   4 +-
 .../codecs/blocktree/AutoPrefixTermsWriter.java |   4 +-
 .../codecs/blocktree/BitSetPostingsEnum.java    |   4 +-
 .../codecs/blocktree/BitSetTermsEnum.java       |   4 +-
 .../codecs/blocktree/BlockTreeTermsReader.java  |   4 +-
 .../codecs/blocktree/BlockTreeTermsWriter.java  |   4 +-
 .../lucene/codecs/blocktree/FieldReader.java    |   4 +-
 .../codecs/blocktree/IntersectTermsEnum.java    |   4 +-
 .../blocktree/IntersectTermsEnumFrame.java      |   4 +-
 .../codecs/blocktree/SegmentTermsEnum.java      |   4 +-
 .../codecs/blocktree/SegmentTermsEnumFrame.java |   4 +-
 .../apache/lucene/codecs/blocktree/Stats.java   |   4 +-
 .../CompressingStoredFieldsFormat.java          |   4 +-
 .../CompressingStoredFieldsIndexReader.java     |   4 +-
 .../CompressingStoredFieldsIndexWriter.java     |   4 +-
 .../CompressingStoredFieldsReader.java          |   4 +-
 .../CompressingStoredFieldsWriter.java          |   4 +-
 .../CompressingTermVectorsFormat.java           |   4 +-
 .../CompressingTermVectorsReader.java           |   4 +-
 .../CompressingTermVectorsWriter.java           |   4 +-
 .../codecs/compressing/CompressionMode.java     |   4 +-
 .../lucene/codecs/compressing/Compressor.java   |   4 +-
 .../lucene/codecs/compressing/Decompressor.java |   4 +-
 .../GrowableByteArrayDataOutput.java            |   4 +-
 .../apache/lucene/codecs/compressing/LZ4.java   |   4 +-
 .../codecs/compressing/MatchingReaders.java     |   4 +-
 .../apache/lucene/codecs/lucene50/ForUtil.java  |   2 +-
 .../codecs/lucene50/Lucene50CompoundFormat.java |   4 +-
 .../codecs/lucene50/Lucene50CompoundReader.java |  32 +-
 .../lucene50/Lucene50FieldInfosFormat.java      |   4 +-
 .../codecs/lucene50/Lucene50LiveDocsFormat.java |   4 +-
 .../codecs/lucene50/Lucene50PostingsFormat.java |   6 +-
 .../codecs/lucene50/Lucene50PostingsReader.java |   4 +-
 .../codecs/lucene50/Lucene50PostingsWriter.java |   4 +-
 .../lucene50/Lucene50SegmentInfoFormat.java     |   4 +-
 .../codecs/lucene50/Lucene50SkipReader.java     |   4 +-
 .../codecs/lucene50/Lucene50SkipWriter.java     |   4 +-
 .../lucene50/Lucene50StoredFieldsFormat.java    |   4 +-
 .../lucene50/Lucene50TermVectorsFormat.java     |   4 +-
 .../codecs/lucene53/Lucene53NormsConsumer.java  |   4 +-
 .../codecs/lucene53/Lucene53NormsFormat.java    |   4 +-
 .../codecs/lucene53/Lucene53NormsProducer.java  |   4 +-
 .../lucene54/Lucene54DocValuesConsumer.java     |   4 +-
 .../lucene54/Lucene54DocValuesFormat.java       |   4 +-
 .../lucene54/Lucene54DocValuesProducer.java     |   4 +-
 .../lucene/codecs/lucene60/Lucene60Codec.java   |   4 +-
 .../lucene60/Lucene60FieldInfosFormat.java      |   4 +-
 .../codecs/lucene60/Lucene60PointFormat.java    |   7 +-
 .../codecs/lucene60/Lucene60PointReader.java    |  68 +-
 .../codecs/lucene60/Lucene60PointWriter.java    |  91 +-
 .../perfield/PerFieldDocValuesFormat.java       |   4 +-
 .../codecs/perfield/PerFieldPostingsFormat.java |   4 +-
 .../lucene/document/BinaryDocValuesField.java   |   4 +-
 .../org/apache/lucene/document/BinaryPoint.java |   4 +-
 .../lucene/document/CompressionTools.java       |   4 +-
 .../org/apache/lucene/document/DateTools.java   |   4 +-
 .../org/apache/lucene/document/Document.java    |   4 +-
 .../document/DocumentStoredFieldVisitor.java    |   4 +-
 .../lucene/document/DoubleDocValuesField.java   |   4 +-
 .../org/apache/lucene/document/DoublePoint.java |  10 +-
 .../java/org/apache/lucene/document/Field.java  |   7 +-
 .../org/apache/lucene/document/FieldType.java   |   4 +-
 .../lucene/document/FloatDocValuesField.java    |   4 +-
 .../org/apache/lucene/document/FloatPoint.java  |  10 +-
 .../org/apache/lucene/document/IntPoint.java    |  10 +-
 .../lucene/document/LegacyDoubleField.java      |   4 +-
 .../lucene/document/LegacyFloatField.java       |   4 +-
 .../apache/lucene/document/LegacyIntField.java  |   4 +-
 .../apache/lucene/document/LegacyLongField.java |   4 +-
 .../org/apache/lucene/document/LongPoint.java   |  10 +-
 .../lucene/document/NumericDocValuesField.java  |   4 +-
 .../lucene/document/SortedDocValuesField.java   |   4 +-
 .../document/SortedNumericDocValuesField.java   |   4 +-
 .../document/SortedSetDocValuesField.java       |   4 +-
 .../org/apache/lucene/document/StoredField.java |   4 +-
 .../org/apache/lucene/document/StringField.java |   4 +-
 .../org/apache/lucene/document/TextField.java   |   4 +-
 .../apache/lucene/index/AbortingException.java  |   4 +-
 .../apache/lucene/index/AutomatonTermsEnum.java |   4 +-
 .../lucene/index/BaseCompositeReader.java       |   4 +-
 .../apache/lucene/index/BinaryDocValues.java    |   4 +-
 .../index/BinaryDocValuesFieldUpdates.java      |   4 +-
 .../lucene/index/BinaryDocValuesWriter.java     |   4 +-
 .../java/org/apache/lucene/index/BitsSlice.java |   8 +-
 .../apache/lucene/index/BufferedUpdates.java    |   4 +-
 .../lucene/index/BufferedUpdatesStream.java     |   4 +-
 .../apache/lucene/index/ByteSliceReader.java    |   4 +-
 .../apache/lucene/index/ByteSliceWriter.java    |  10 +-
 .../org/apache/lucene/index/CheckIndex.java     |   4 +-
 .../apache/lucene/index/CoalescedUpdates.java   |   4 +-
 .../org/apache/lucene/index/CodecReader.java    |   4 +-
 .../apache/lucene/index/CompositeReader.java    |   4 +-
 .../lucene/index/CompositeReaderContext.java    |   4 +-
 .../lucene/index/ConcurrentMergeScheduler.java  |   4 +-
 .../lucene/index/CorruptIndexException.java     |   4 +-
 .../lucene/index/DefaultIndexingChain.java      |  33 +-
 .../apache/lucene/index/DirectoryReader.java    |   4 +-
 .../org/apache/lucene/index/DocConsumer.java    |   4 +-
 .../java/org/apache/lucene/index/DocValues.java |   4 +-
 .../lucene/index/DocValuesFieldUpdates.java     |   4 +-
 .../org/apache/lucene/index/DocValuesType.java  |   4 +-
 .../apache/lucene/index/DocValuesUpdate.java    |   4 +-
 .../apache/lucene/index/DocValuesWriter.java    |   4 +-
 .../apache/lucene/index/DocumentsWriter.java    |   4 +-
 .../index/DocumentsWriterDeleteQueue.java       |  27 +-
 .../index/DocumentsWriterFlushControl.java      |  10 +-
 .../lucene/index/DocumentsWriterFlushQueue.java |  28 +-
 .../lucene/index/DocumentsWriterPerThread.java  |  10 +-
 .../index/DocumentsWriterPerThreadPool.java     |   8 +-
 .../index/DocumentsWriterStallControl.java      |  10 +-
 .../lucene/index/ExitableDirectoryReader.java   |   4 +-
 .../java/org/apache/lucene/index/FieldInfo.java |   4 +-
 .../org/apache/lucene/index/FieldInfos.java     |   4 +-
 .../apache/lucene/index/FieldTermIterator.java  |   4 +-
 .../java/org/apache/lucene/index/Fields.java    |   4 +-
 .../apache/lucene/index/FilterCodecReader.java  |   4 +-
 .../lucene/index/FilterDirectoryReader.java     |   4 +-
 .../apache/lucene/index/FilterLeafReader.java   |   4 +-
 .../apache/lucene/index/FilteredTermsEnum.java  |   4 +-
 .../lucene/index/FlushByRamOrCountsPolicy.java  |  10 +-
 .../org/apache/lucene/index/FlushPolicy.java    |  10 +-
 .../org/apache/lucene/index/FreqProxFields.java |   4 +-
 .../lucene/index/FreqProxTermsWriter.java       |   4 +-
 .../index/FreqProxTermsWriterPerField.java      |   4 +-
 .../lucene/index/FrozenBufferedUpdates.java     |   4 +-
 .../org/apache/lucene/index/IndexCommit.java    |   5 +-
 .../lucene/index/IndexDeletionPolicy.java       |   4 +-
 .../apache/lucene/index/IndexFileDeleter.java   | 141 +--
 .../org/apache/lucene/index/IndexFileNames.java |   4 +-
 .../index/IndexFormatTooNewException.java       |   1 -
 .../index/IndexFormatTooOldException.java       |   1 -
 .../lucene/index/IndexNotFoundException.java    |   4 +-
 .../org/apache/lucene/index/IndexOptions.java   |   4 +-
 .../org/apache/lucene/index/IndexReader.java    |   8 +-
 .../apache/lucene/index/IndexReaderContext.java |   4 +-
 .../org/apache/lucene/index/IndexUpgrader.java  |   4 +-
 .../org/apache/lucene/index/IndexWriter.java    |  18 +-
 .../apache/lucene/index/IndexWriterConfig.java  |   4 +-
 .../org/apache/lucene/index/IndexableField.java |  12 +-
 .../apache/lucene/index/IndexableFieldType.java |   4 +-
 .../index/KeepOnlyLastCommitDeletionPolicy.java |   4 +-
 .../org/apache/lucene/index/LeafReader.java     |   4 +-
 .../apache/lucene/index/LeafReaderContext.java  |   4 +-
 .../lucene/index/LiveIndexWriterConfig.java     |   4 +-
 .../lucene/index/LogByteSizeMergePolicy.java    |   4 +-
 .../apache/lucene/index/LogDocMergePolicy.java  |   8 +-
 .../org/apache/lucene/index/LogMergePolicy.java |   4 +-
 .../apache/lucene/index/MappedMultiFields.java  |   4 +-
 .../lucene/index/MappingMultiPostingsEnum.java  |   4 +-
 .../org/apache/lucene/index/MergePolicy.java    |  10 +-
 .../apache/lucene/index/MergePolicyWrapper.java |  89 ++
 .../apache/lucene/index/MergeRateLimiter.java   |   4 +-
 .../org/apache/lucene/index/MergeScheduler.java |   4 +-
 .../org/apache/lucene/index/MergeState.java     |   4 +-
 .../org/apache/lucene/index/MergeTrigger.java   |   4 +-
 .../index/MergedPrefixCodedTermsIterator.java   |   4 +-
 .../java/org/apache/lucene/index/MultiBits.java |   8 +-
 .../org/apache/lucene/index/MultiDocValues.java |   4 +-
 .../org/apache/lucene/index/MultiFields.java    |   4 +-
 .../apache/lucene/index/MultiPointValues.java   |   8 +-
 .../apache/lucene/index/MultiPostingsEnum.java  |   4 +-
 .../org/apache/lucene/index/MultiReader.java    |   4 +-
 .../org/apache/lucene/index/MultiTerms.java     |   4 +-
 .../org/apache/lucene/index/MultiTermsEnum.java |   4 +-
 .../apache/lucene/index/NoDeletionPolicy.java   |   4 +-
 .../org/apache/lucene/index/NoMergePolicy.java  |  22 +-
 .../apache/lucene/index/NoMergeScheduler.java   |   4 +-
 .../apache/lucene/index/NormValuesWriter.java   |   4 +-
 .../apache/lucene/index/NumericDocValues.java   |   4 +-
 .../index/NumericDocValuesFieldUpdates.java     |  18 +-
 .../lucene/index/NumericDocValuesWriter.java    |   4 +-
 .../org/apache/lucene/index/OrdTermState.java   |   4 +-
 .../lucene/index/ParallelCompositeReader.java   |   4 +-
 .../apache/lucene/index/ParallelLeafReader.java |   4 +-
 .../lucene/index/ParallelPostingsArray.java     |   4 +-
 .../index/PersistentSnapshotDeletionPolicy.java |  29 +-
 .../org/apache/lucene/index/PointValues.java    |  12 +-
 .../apache/lucene/index/PointValuesWriter.java  |   4 +-
 .../org/apache/lucene/index/PostingsEnum.java   |   4 +-
 .../apache/lucene/index/PrefixCodedTerms.java   |  25 +-
 .../org/apache/lucene/index/QueryTimeout.java   |   4 +-
 .../apache/lucene/index/QueryTimeoutImpl.java   |   4 +-
 .../apache/lucene/index/RandomAccessOrds.java   |   4 +-
 .../org/apache/lucene/index/ReaderManager.java  |   4 +-
 .../org/apache/lucene/index/ReaderSlice.java    |   4 +-
 .../org/apache/lucene/index/ReaderUtil.java     |   4 +-
 .../apache/lucene/index/ReadersAndUpdates.java  |   4 +-
 .../apache/lucene/index/SegmentCommitInfo.java  |   4 +-
 .../apache/lucene/index/SegmentCoreReaders.java |   8 +-
 .../apache/lucene/index/SegmentDocValues.java   |   4 +-
 .../lucene/index/SegmentDocValuesProducer.java  |   4 +-
 .../org/apache/lucene/index/SegmentInfo.java    |   4 +-
 .../org/apache/lucene/index/SegmentInfos.java   |   4 +-
 .../org/apache/lucene/index/SegmentMerger.java  |   4 +-
 .../apache/lucene/index/SegmentReadState.java   |   4 +-
 .../org/apache/lucene/index/SegmentReader.java  |   4 +-
 .../apache/lucene/index/SegmentWriteState.java  |   4 +-
 .../lucene/index/SerialMergeScheduler.java      |   4 +-
 .../lucene/index/SimpleMergedSegmentWarmer.java |   4 +-
 .../apache/lucene/index/SingleTermsEnum.java    |   4 +-
 .../index/SingletonSortedNumericDocValues.java  |   4 +-
 .../index/SingletonSortedSetDocValues.java      |   4 +-
 .../lucene/index/SlowCodecReaderWrapper.java    |   4 +-
 .../index/SlowCompositeReaderWrapper.java       |   4 +-
 .../lucene/index/SnapshotDeletionPolicy.java    |   4 +-
 .../apache/lucene/index/SortedDocValues.java    |   4 +-
 .../lucene/index/SortedDocValuesTermsEnum.java  |   4 +-
 .../lucene/index/SortedDocValuesWriter.java     |   4 +-
 .../lucene/index/SortedNumericDocValues.java    |   4 +-
 .../index/SortedNumericDocValuesWriter.java     |   4 +-
 .../apache/lucene/index/SortedSetDocValues.java |   4 +-
 .../index/SortedSetDocValuesTermsEnum.java      |   4 +-
 .../lucene/index/SortedSetDocValuesWriter.java  |   4 +-
 .../lucene/index/StandardDirectoryReader.java   |   4 +-
 .../apache/lucene/index/StoredFieldVisitor.java |   4 +-
 .../src/java/org/apache/lucene/index/Term.java  |   4 +-
 .../org/apache/lucene/index/TermContext.java    |   4 +-
 .../java/org/apache/lucene/index/TermState.java |   4 +-
 .../lucene/index/TermVectorsConsumer.java       |   4 +-
 .../index/TermVectorsConsumerPerField.java      |   4 +-
 .../src/java/org/apache/lucene/index/Terms.java |   4 +-
 .../java/org/apache/lucene/index/TermsEnum.java |   4 +-
 .../java/org/apache/lucene/index/TermsHash.java |   4 +-
 .../apache/lucene/index/TermsHashPerField.java  |   4 +-
 .../apache/lucene/index/TieredMergePolicy.java  |   8 +-
 .../lucene/index/TrackingIndexWriter.java       |   4 +-
 .../org/apache/lucene/index/TwoPhaseCommit.java |   8 +-
 .../apache/lucene/index/TwoPhaseCommitTool.java |   8 +-
 .../lucene/index/UpgradeIndexMergePolicy.java   |  34 +-
 .../apache/lucene/search/AutomatonQuery.java    |   4 +-
 .../apache/lucene/search/BlendedTermQuery.java  |   4 +-
 .../org/apache/lucene/search/BooleanClause.java |   4 +-
 .../org/apache/lucene/search/BooleanQuery.java  |   4 +-
 .../org/apache/lucene/search/BooleanScorer.java |   4 +-
 .../lucene/search/BooleanTopLevelScorers.java   |   4 +-
 .../org/apache/lucene/search/BooleanWeight.java |   4 +-
 .../apache/lucene/search/BoostAttribute.java    |   4 +-
 .../lucene/search/BoostAttributeImpl.java       |   4 +-
 .../org/apache/lucene/search/BoostQuery.java    |   4 +-
 .../org/apache/lucene/search/BulkScorer.java    |   4 +-
 .../apache/lucene/search/CachingCollector.java  |   4 +-
 .../lucene/search/CollectionStatistics.java     |  10 +-
 .../search/CollectionTerminatedException.java   |   4 +-
 .../org/apache/lucene/search/Collector.java     |   4 +-
 .../apache/lucene/search/CollectorManager.java  |   4 +-
 .../apache/lucene/search/ConjunctionDISI.java   |   4 +-
 .../apache/lucene/search/ConjunctionScorer.java |   4 +-
 .../lucene/search/ConstantScoreQuery.java       |   4 +-
 .../lucene/search/ConstantScoreScorer.java      |   4 +-
 .../lucene/search/ConstantScoreWeight.java      |   4 +-
 .../search/ControlledRealTimeReopenThread.java  |   4 +-
 .../apache/lucene/search/DisiPriorityQueue.java |   4 +-
 .../org/apache/lucene/search/DisiWrapper.java   |   4 +-
 .../search/DisjunctionDISIApproximation.java    |   2 +-
 .../lucene/search/DisjunctionMaxQuery.java      |  14 +-
 .../lucene/search/DisjunctionMaxScorer.java     |  14 +-
 .../apache/lucene/search/DisjunctionScorer.java |   4 +-
 .../lucene/search/DisjunctionSumScorer.java     |   4 +-
 .../java/org/apache/lucene/search/DocIdSet.java |   4 +-
 .../apache/lucene/search/DocIdSetIterator.java  |   4 +-
 .../apache/lucene/search/DocValuesDocIdSet.java |   2 +-
 .../lucene/search/DocValuesRewriteMethod.java   |   4 +-
 .../apache/lucene/search/ExactPhraseScorer.java |   4 +-
 .../apache/lucene/search/ExactPointQuery.java   |   4 +-
 .../org/apache/lucene/search/Explanation.java   |   4 +-
 .../org/apache/lucene/search/FakeScorer.java    |   4 +-
 .../apache/lucene/search/FieldComparator.java   |   4 +-
 .../lucene/search/FieldComparatorSource.java    |   4 +-
 .../java/org/apache/lucene/search/FieldDoc.java |   4 +-
 .../lucene/search/FieldValueHitQueue.java       |   4 +-
 .../apache/lucene/search/FieldValueQuery.java   |   4 +-
 .../apache/lucene/search/FilterCollector.java   |  12 +-
 .../lucene/search/FilterLeafCollector.java      |   4 +-
 .../org/apache/lucene/search/FilterScorer.java  |   4 +-
 .../lucene/search/FilteredDocIdSetIterator.java |   4 +-
 .../org/apache/lucene/search/FuzzyQuery.java    |   4 +-
 .../apache/lucene/search/FuzzyTermsEnum.java    |   4 +-
 .../java/org/apache/lucene/search/HitQueue.java |   4 +-
 .../org/apache/lucene/search/IndexSearcher.java |   4 +-
 .../org/apache/lucene/search/LRUQueryCache.java |   4 +-
 .../org/apache/lucene/search/LeafCollector.java |   4 +-
 .../lucene/search/LeafFieldComparator.java      |   4 +-
 .../lucene/search/LegacyNumericRangeQuery.java  |   4 +-
 .../apache/lucene/search/LiveFieldValues.java   |   4 +-
 .../apache/lucene/search/MatchAllDocsQuery.java |   4 +-
 .../apache/lucene/search/MatchNoDocsQuery.java  |   4 +-
 .../search/MaxNonCompetitiveBoostAttribute.java |   4 +-
 .../MaxNonCompetitiveBoostAttributeImpl.java    |   4 +-
 .../lucene/search/MinShouldMatchSumScorer.java  |   4 +-
 .../apache/lucene/search/MultiCollector.java    |   4 +-
 .../apache/lucene/search/MultiPhraseQuery.java  |   4 +-
 .../apache/lucene/search/MultiTermQuery.java    |   4 +-
 .../MultiTermQueryConstantScoreWrapper.java     |   4 +-
 .../java/org/apache/lucene/search/Multiset.java |   4 +-
 .../apache/lucene/search/NGramPhraseQuery.java  |   4 +-
 .../apache/lucene/search/PhrasePositions.java   |   4 +-
 .../org/apache/lucene/search/PhraseQuery.java   |   4 +-
 .../org/apache/lucene/search/PhraseQueue.java   |   4 +-
 .../apache/lucene/search/PointRangeQuery.java   |   4 +-
 .../search/PositiveScoresOnlyCollector.java     |   4 +-
 .../org/apache/lucene/search/PrefixQuery.java   |   4 +-
 .../java/org/apache/lucene/search/Query.java    |   4 +-
 .../org/apache/lucene/search/QueryCache.java    |   4 +-
 .../lucene/search/QueryCachingPolicy.java       |   4 +-
 .../org/apache/lucene/search/QueryRescorer.java |   4 +-
 .../lucene/search/RandomAccessWeight.java       |   4 +-
 .../apache/lucene/search/ReferenceManager.java  |   4 +-
 .../org/apache/lucene/search/RegexpQuery.java   |   4 +-
 .../apache/lucene/search/ReqExclBulkScorer.java |   4 +-
 .../org/apache/lucene/search/ReqExclScorer.java |   4 +-
 .../apache/lucene/search/ReqOptSumScorer.java   |   2 +-
 .../java/org/apache/lucene/search/Rescorer.java |   4 +-
 .../search/ScoreCachingWrappingScorer.java      |   4 +-
 .../java/org/apache/lucene/search/ScoreDoc.java |   4 +-
 .../java/org/apache/lucene/search/Scorer.java   |   4 +-
 .../apache/lucene/search/ScoringRewrite.java    |   4 +-
 .../apache/lucene/search/SearcherFactory.java   |   4 +-
 .../lucene/search/SearcherLifetimeManager.java  |   4 +-
 .../apache/lucene/search/SearcherManager.java   |   4 +-
 .../apache/lucene/search/SimpleCollector.java   |   4 +-
 .../lucene/search/SimpleFieldComparator.java    |   4 +-
 .../lucene/search/SloppyPhraseScorer.java       |   4 +-
 .../src/java/org/apache/lucene/search/Sort.java |   4 +-
 .../org/apache/lucene/search/SortField.java     |   4 +-
 .../org/apache/lucene/search/SortRescorer.java  |   4 +-
 .../lucene/search/SortedNumericSelector.java    |   4 +-
 .../lucene/search/SortedNumericSortField.java   |   4 +-
 .../apache/lucene/search/SortedSetSelector.java |   4 +-
 .../lucene/search/SortedSetSortField.java       |   4 +-
 .../org/apache/lucene/search/SynonymQuery.java  |   4 +-
 .../lucene/search/TermCollectingRewrite.java    |   4 +-
 .../org/apache/lucene/search/TermQuery.java     |   4 +-
 .../apache/lucene/search/TermRangeQuery.java    |   4 +-
 .../org/apache/lucene/search/TermScorer.java    |   4 +-
 .../apache/lucene/search/TermStatistics.java    |   4 +-
 .../lucene/search/TimeLimitingCollector.java    |   4 +-
 .../java/org/apache/lucene/search/TopDocs.java  |   4 +-
 .../apache/lucene/search/TopDocsCollector.java  |   4 +-
 .../apache/lucene/search/TopFieldCollector.java |   4 +-
 .../org/apache/lucene/search/TopFieldDocs.java  |   4 +-
 .../lucene/search/TopScoreDocCollector.java     |   4 +-
 .../apache/lucene/search/TopTermsRewrite.java   |   4 +-
 .../lucene/search/TotalHitCountCollector.java   |   4 +-
 .../apache/lucene/search/TwoPhaseIterator.java  |   4 +-
 .../search/UsageTrackingQueryCachingPolicy.java |   4 +-
 .../java/org/apache/lucene/search/Weight.java   |   4 +-
 .../org/apache/lucene/search/WildcardQuery.java |   4 +-
 .../lucene/search/similarities/AfterEffect.java |   4 +-
 .../search/similarities/AfterEffectB.java       |   4 +-
 .../search/similarities/AfterEffectL.java       |   4 +-
 .../search/similarities/BM25Similarity.java     |   4 +-
 .../lucene/search/similarities/BasicModel.java  |   4 +-
 .../search/similarities/BasicModelBE.java       |   4 +-
 .../lucene/search/similarities/BasicModelD.java |   4 +-
 .../lucene/search/similarities/BasicModelG.java |   4 +-
 .../search/similarities/BasicModelIF.java       |   4 +-
 .../search/similarities/BasicModelIn.java       |   4 +-
 .../search/similarities/BasicModelIne.java      |   4 +-
 .../lucene/search/similarities/BasicModelP.java |   4 +-
 .../lucene/search/similarities/BasicStats.java  |   4 +-
 .../search/similarities/ClassicSimilarity.java  |   4 +-
 .../search/similarities/DFISimilarity.java      |   4 +-
 .../search/similarities/DFRSimilarity.java      |   4 +-
 .../search/similarities/Distribution.java       |   4 +-
 .../search/similarities/DistributionLL.java     |   4 +-
 .../search/similarities/DistributionSPL.java    |   4 +-
 .../search/similarities/IBSimilarity.java       |   4 +-
 .../search/similarities/Independence.java       |   4 +-
 .../similarities/IndependenceChiSquared.java    |   4 +-
 .../similarities/IndependenceSaturated.java     |   4 +-
 .../similarities/IndependenceStandardized.java  |   4 +-
 .../similarities/LMDirichletSimilarity.java     |   4 +-
 .../similarities/LMJelinekMercerSimilarity.java |   4 +-
 .../search/similarities/LMSimilarity.java       |   4 +-
 .../lucene/search/similarities/Lambda.java      |   4 +-
 .../lucene/search/similarities/LambdaDF.java    |   4 +-
 .../lucene/search/similarities/LambdaTTF.java   |   4 +-
 .../search/similarities/MultiSimilarity.java    |   4 +-
 .../search/similarities/Normalization.java      |   4 +-
 .../search/similarities/NormalizationH1.java    |   4 +-
 .../search/similarities/NormalizationH2.java    |   4 +-
 .../search/similarities/NormalizationH3.java    |   4 +-
 .../search/similarities/NormalizationZ.java     |   4 +-
 .../similarities/PerFieldSimilarityWrapper.java |   4 +-
 .../lucene/search/similarities/Similarity.java  |   4 +-
 .../search/similarities/SimilarityBase.java     |   4 +-
 .../search/similarities/TFIDFSimilarity.java    |   4 +-
 .../lucene/search/spans/ConjunctionSpans.java   |   4 +-
 .../lucene/search/spans/ContainSpans.java       |   4 +-
 .../search/spans/FieldMaskingSpanQuery.java     |   4 +-
 .../apache/lucene/search/spans/FilterSpans.java |   4 +-
 .../lucene/search/spans/NearSpansOrdered.java   |   4 +-
 .../lucene/search/spans/NearSpansUnordered.java |   4 +-
 .../search/spans/ScoringWrapperSpans.java       |   4 +-
 .../lucene/search/spans/SpanBoostQuery.java     |   4 +-
 .../lucene/search/spans/SpanCollector.java      |   4 +-
 .../lucene/search/spans/SpanContainQuery.java   |   4 +-
 .../search/spans/SpanContainingQuery.java       |   4 +-
 .../lucene/search/spans/SpanFirstQuery.java     |   4 +-
 .../search/spans/SpanMultiTermQueryWrapper.java |   4 +-
 .../lucene/search/spans/SpanNearQuery.java      |   4 +-
 .../lucene/search/spans/SpanNotQuery.java       |   4 +-
 .../apache/lucene/search/spans/SpanOrQuery.java |   4 +-
 .../search/spans/SpanPositionCheckQuery.java    |   2 +-
 .../lucene/search/spans/SpanPositionQueue.java  |   4 +-
 .../search/spans/SpanPositionRangeQuery.java    |   2 +-
 .../apache/lucene/search/spans/SpanQuery.java   |   4 +-
 .../apache/lucene/search/spans/SpanScorer.java  |   4 +-
 .../lucene/search/spans/SpanTermQuery.java      |   4 +-
 .../apache/lucene/search/spans/SpanWeight.java  |   4 +-
 .../lucene/search/spans/SpanWithinQuery.java    |   4 +-
 .../org/apache/lucene/search/spans/Spans.java   |   4 +-
 .../apache/lucene/search/spans/TermSpans.java   |  14 +-
 .../lucene/store/AlreadyClosedException.java    |   4 +-
 .../org/apache/lucene/store/BaseDirectory.java  |   4 +-
 .../apache/lucene/store/BufferedChecksum.java   |   4 +-
 .../store/BufferedChecksumIndexInput.java       |   4 +-
 .../apache/lucene/store/BufferedIndexInput.java |   4 +-
 .../apache/lucene/store/ByteArrayDataInput.java |   4 +-
 .../lucene/store/ByteArrayDataOutput.java       |   4 +-
 .../lucene/store/ByteBufferIndexInput.java      |   4 +-
 .../apache/lucene/store/ChecksumIndexInput.java |   8 +-
 .../java/org/apache/lucene/store/DataInput.java |   4 +-
 .../org/apache/lucene/store/DataOutput.java     |   4 +-
 .../java/org/apache/lucene/store/Directory.java |   7 +-
 .../org/apache/lucene/store/FSDirectory.java    | 152 ++-
 .../org/apache/lucene/store/FSLockFactory.java  |   4 +-
 .../lucene/store/FileSwitchDirectory.java       |  10 +-
 .../apache/lucene/store/FilterDirectory.java    |   4 +-
 .../java/org/apache/lucene/store/FlushInfo.java |   4 +-
 .../java/org/apache/lucene/store/IOContext.java |   4 +-
 .../org/apache/lucene/store/IndexInput.java     |   4 +-
 .../org/apache/lucene/store/IndexOutput.java    |   4 +-
 .../lucene/store/InputStreamDataInput.java      |   4 +-
 .../src/java/org/apache/lucene/store/Lock.java  |   4 +-
 .../org/apache/lucene/store/LockFactory.java    |   4 +-
 .../lucene/store/LockObtainFailedException.java |   1 -
 .../store/LockReleaseFailedException.java       |   1 -
 .../org/apache/lucene/store/LockStressTest.java |   4 +-
 .../store/LockValidatingDirectoryWrapper.java   |   4 +-
 .../apache/lucene/store/LockVerifyServer.java   |   4 +-
 .../org/apache/lucene/store/MMapDirectory.java  |   5 +-
 .../java/org/apache/lucene/store/MergeInfo.java |   2 +-
 .../org/apache/lucene/store/NIOFSDirectory.java |  29 +-
 .../lucene/store/NRTCachingDirectory.java       |   6 +-
 .../lucene/store/NativeFSLockFactory.java       |   4 +-
 .../org/apache/lucene/store/NoLockFactory.java  |   4 +-
 .../lucene/store/OutputStreamDataOutput.java    |   4 +-
 .../lucene/store/OutputStreamIndexOutput.java   |   4 +-
 .../org/apache/lucene/store/RAMDirectory.java   |  13 +-
 .../java/org/apache/lucene/store/RAMFile.java   |   4 +-
 .../org/apache/lucene/store/RAMInputStream.java |   4 +-
 .../apache/lucene/store/RAMOutputStream.java    |   6 +-
 .../apache/lucene/store/RandomAccessInput.java  |   4 +-
 .../lucene/store/RateLimitedIndexOutput.java    |   4 +-
 .../org/apache/lucene/store/RateLimiter.java    |   4 +-
 .../apache/lucene/store/SimpleFSDirectory.java  |   5 +-
 .../lucene/store/SimpleFSLockFactory.java       |   4 +-
 .../lucene/store/SingleInstanceLockFactory.java |   4 +-
 .../lucene/store/SleepingLockWrapper.java       |   4 +-
 .../lucene/store/TrackingDirectoryWrapper.java  |   4 +-
 .../lucene/store/VerifyingLockFactory.java      |   4 +-
 .../org/apache/lucene/util/Accountable.java     |   4 +-
 .../org/apache/lucene/util/Accountables.java    |   4 +-
 .../lucene/util/ArrayInPlaceMergeSorter.java    |   4 +-
 .../apache/lucene/util/ArrayIntroSorter.java    |   4 +-
 .../org/apache/lucene/util/ArrayTimSorter.java  |   4 +-
 .../java/org/apache/lucene/util/ArrayUtil.java  |   4 +-
 .../java/org/apache/lucene/util/Attribute.java  |   4 +-
 .../apache/lucene/util/AttributeFactory.java    |   4 +-
 .../org/apache/lucene/util/AttributeImpl.java   |   4 +-
 .../apache/lucene/util/AttributeReflector.java  |   4 +-
 .../org/apache/lucene/util/AttributeSource.java |   4 +-
 .../org/apache/lucene/util/BitDocIdSet.java     |   4 +-
 .../src/java/org/apache/lucene/util/BitSet.java |   4 +-
 .../org/apache/lucene/util/BitSetIterator.java  |   4 +-
 .../java/org/apache/lucene/util/BitUtil.java    |   1 -
 .../src/java/org/apache/lucene/util/Bits.java   |   4 +-
 .../org/apache/lucene/util/ByteBlockPool.java   |   4 +-
 .../java/org/apache/lucene/util/BytesRef.java   |   4 +-
 .../org/apache/lucene/util/BytesRefArray.java   |  27 +-
 .../org/apache/lucene/util/BytesRefBuilder.java |   4 +-
 .../org/apache/lucene/util/BytesRefHash.java    |   4 +-
 .../apache/lucene/util/BytesRefIterator.java    |   4 +-
 .../java/org/apache/lucene/util/CharsRef.java   |   4 +-
 .../org/apache/lucene/util/CharsRefBuilder.java |   4 +-
 .../lucene/util/CloseableThreadLocal.java       |   4 +-
 .../org/apache/lucene/util/CollectionUtil.java  |   4 +-
 .../org/apache/lucene/util/CommandLineUtil.java |   4 +-
 .../java/org/apache/lucene/util/Constants.java  |   4 +-
 .../java/org/apache/lucene/util/Counter.java    |   8 +-
 .../org/apache/lucene/util/DocIdSetBuilder.java |   4 +-
 .../org/apache/lucene/util/FilterIterator.java  |  27 +-
 .../org/apache/lucene/util/FixedBitSet.java     |   4 +-
 .../util/FrequencyTrackingRingBuffer.java       |   4 +-
 .../java/org/apache/lucene/util/IOUtils.java    |  12 +-
 .../apache/lucene/util/InPlaceMergeSorter.java  |   4 +-
 .../java/org/apache/lucene/util/InfoStream.java |   4 +-
 .../apache/lucene/util/IntArrayDocIdSet.java    |   4 +-
 .../org/apache/lucene/util/IntBlockPool.java    |   4 +-
 .../org/apache/lucene/util/IntroSorter.java     |   4 +-
 .../java/org/apache/lucene/util/IntsRef.java    |   8 +-
 .../org/apache/lucene/util/IntsRefBuilder.java  |   4 +-
 .../org/apache/lucene/util/LSBRadixSorter.java  |   4 +-
 .../apache/lucene/util/LegacyNumericUtils.java  |   4 +-
 .../java/org/apache/lucene/util/LongBitSet.java |   4 +-
 .../java/org/apache/lucene/util/LongValues.java |   4 +-
 .../java/org/apache/lucene/util/LongsRef.java   |   8 +-
 .../java/org/apache/lucene/util/MapOfSets.java  |   4 +-
 .../java/org/apache/lucene/util/MathUtil.java   |   4 +-
 .../org/apache/lucene/util/MergedIterator.java  |   4 +-
 .../org/apache/lucene/util/MutableBits.java     |   4 +-
 .../org/apache/lucene/util/NamedSPILoader.java  |   4 +-
 .../apache/lucene/util/NamedThreadFactory.java  |   4 +-
 .../org/apache/lucene/util/NotDocIdSet.java     |   4 +-
 .../org/apache/lucene/util/NumericUtils.java    |   4 +-
 .../org/apache/lucene/util/OfflineSorter.java   |   4 +-
 .../java/org/apache/lucene/util/PagedBytes.java |   4 +-
 .../lucene/util/PrintStreamInfoStream.java      |   4 +-
 .../org/apache/lucene/util/PriorityQueue.java   |  10 +-
 .../org/apache/lucene/util/QueryBuilder.java    |   4 +-
 .../apache/lucene/util/RamUsageEstimator.java   |   4 +-
 .../util/RecyclingByteBlockAllocator.java       |   8 +-
 .../lucene/util/RecyclingIntBlockAllocator.java |   8 +-
 .../java/org/apache/lucene/util/RefCount.java   |  10 +-
 .../org/apache/lucene/util/RoaringDocIdSet.java |   4 +-
 .../org/apache/lucene/util/RollingBuffer.java   |   4 +-
 .../apache/lucene/util/SPIClassIterator.java    |   4 +-
 .../org/apache/lucene/util/SentinelIntSet.java  |   4 +-
 .../java/org/apache/lucene/util/SetOnce.java    |   8 +-
 .../java/org/apache/lucene/util/SloppyMath.java |  10 +-
 .../java/org/apache/lucene/util/SmallFloat.java |  14 +-
 .../src/java/org/apache/lucene/util/Sorter.java |   4 +-
 .../apache/lucene/util/SparseFixedBitSet.java   |   4 +-
 .../lucene/util/StrictStringTokenizer.java      |   4 +-
 .../org/apache/lucene/util/StringHelper.java    |   4 +-
 .../apache/lucene/util/SuppressForbidden.java   |   4 +-
 .../lucene/util/ThreadInterruptedException.java |   9 +-
 .../java/org/apache/lucene/util/TimSorter.java  |   4 +-
 .../org/apache/lucene/util/ToStringUtils.java   |   4 +-
 .../org/apache/lucene/util/UnicodeUtil.java     |   6 +-
 .../java/org/apache/lucene/util/Version.java    |   4 +-
 .../org/apache/lucene/util/VirtualMethod.java   |   4 +-
 .../org/apache/lucene/util/WeakIdentityMap.java |   4 +-
 .../apache/lucene/util/automaton/Automaton.java |   4 +-
 .../lucene/util/automaton/ByteRunAutomaton.java |   4 +-
 .../util/automaton/CharacterRunAutomaton.java   |   4 +-
 .../util/automaton/CompiledAutomaton.java       |   4 +-
 .../automaton/DaciukMihovAutomatonBuilder.java  |   4 +-
 .../util/automaton/FiniteStringsIterator.java   |   4 +-
 .../automaton/Lev1ParametricDescription.java    |   3 +-
 .../automaton/Lev1TParametricDescription.java   |   3 +-
 .../automaton/Lev2ParametricDescription.java    |   3 +-
 .../automaton/Lev2TParametricDescription.java   |   3 +-
 .../util/automaton/LevenshteinAutomata.java     |   4 +-
 .../automaton/LimitedFiniteStringsIterator.java |   4 +-
 .../lucene/util/automaton/SortedIntSet.java     |   4 +-
 .../TooComplexToDeterminizeException.java       |   4 +-
 .../lucene/util/automaton/Transition.java       |   4 +-
 .../lucene/util/automaton/UTF32ToUTF8.java      |   4 +-
 .../lucene/util/automaton/createLevAutomata.py  |  89 +-
 .../org/apache/lucene/util/bkd/BKDReader.java   |   4 +-
 .../org/apache/lucene/util/bkd/BKDWriter.java   |   4 +-
 .../apache/lucene/util/bkd/HeapPointReader.java |   4 +-
 .../apache/lucene/util/bkd/HeapPointWriter.java |   4 +-
 .../lucene/util/bkd/OfflinePointReader.java     |   4 +-
 .../lucene/util/bkd/OfflinePointWriter.java     |   5 +-
 .../org/apache/lucene/util/bkd/PointReader.java |   4 +-
 .../org/apache/lucene/util/bkd/PointWriter.java |   4 +-
 .../org/apache/lucene/util/fst/Builder.java     |   4 +-
 .../lucene/util/fst/ByteSequenceOutputs.java    |   4 +-
 .../apache/lucene/util/fst/BytesRefFSTEnum.java |   4 +-
 .../org/apache/lucene/util/fst/BytesStore.java  |   4 +-
 .../lucene/util/fst/CharSequenceOutputs.java    |   4 +-
 .../java/org/apache/lucene/util/fst/FST.java    |   4 +-
 .../org/apache/lucene/util/fst/FSTEnum.java     |   4 +-
 .../lucene/util/fst/ForwardBytesReader.java     |   4 +-
 .../lucene/util/fst/IntSequenceOutputs.java     |   4 +-
 .../apache/lucene/util/fst/IntsRefFSTEnum.java  |   4 +-
 .../org/apache/lucene/util/fst/NoOutputs.java   |   4 +-
 .../org/apache/lucene/util/fst/NodeHash.java    |   4 +-
 .../org/apache/lucene/util/fst/Outputs.java     |   4 +-
 .../org/apache/lucene/util/fst/PairOutputs.java |   4 +-
 .../lucene/util/fst/PositiveIntOutputs.java     |   4 +-
 .../lucene/util/fst/ReverseBytesReader.java     |   4 +-
 .../java/org/apache/lucene/util/fst/Util.java   |   4 +-
 .../util/packed/AbstractBlockPackedWriter.java  |   4 +-
 .../util/packed/AbstractPagedMutable.java       |   4 +-
 .../lucene/util/packed/BlockPackedReader.java   |   4 +-
 .../util/packed/BlockPackedReaderIterator.java  |   4 +-
 .../lucene/util/packed/BlockPackedWriter.java   |   4 +-
 .../lucene/util/packed/BulkOperation.java       |   3 +-
 .../lucene/util/packed/BulkOperationPacked.java |   6 +-
 .../util/packed/BulkOperationPacked1.java       |   3 +-
 .../util/packed/BulkOperationPacked10.java      |   3 +-
 .../util/packed/BulkOperationPacked11.java      |   3 +-
 .../util/packed/BulkOperationPacked12.java      |   3 +-
 .../util/packed/BulkOperationPacked13.java      |   3 +-
 .../util/packed/BulkOperationPacked14.java      |   3 +-
 .../util/packed/BulkOperationPacked15.java      |   3 +-
 .../util/packed/BulkOperationPacked16.java      |   3 +-
 .../util/packed/BulkOperationPacked17.java      |   3 +-
 .../util/packed/BulkOperationPacked18.java      |   3 +-
 .../util/packed/BulkOperationPacked19.java      |   3 +-
 .../util/packed/BulkOperationPacked2.java       |   3 +-
 .../util/packed/BulkOperationPacked20.java      |   3 +-
 .../util/packed/BulkOperationPacked21.java      |   3 +-
 .../util/packed/BulkOperationPacked22.java      |   3 +-
 .../util/packed/BulkOperationPacked23.java      |   3 +-
 .../util/packed/BulkOperationPacked24.java      |   3 +-
 .../util/packed/BulkOperationPacked3.java       |   3 +-
 .../util/packed/BulkOperationPacked4.java       |   3 +-
 .../util/packed/BulkOperationPacked5.java       |   3 +-
 .../util/packed/BulkOperationPacked6.java       |   3 +-
 .../util/packed/BulkOperationPacked7.java       |   3 +-
 .../util/packed/BulkOperationPacked8.java       |   3 +-
 .../util/packed/BulkOperationPacked9.java       |   3 +-
 .../packed/BulkOperationPackedSingleBlock.java  |   4 +-
 .../util/packed/DeltaPackedLongValues.java      |   4 +-
 .../org/apache/lucene/util/packed/Direct16.java |   8 +-
 .../org/apache/lucene/util/packed/Direct32.java |   8 +-
 .../org/apache/lucene/util/packed/Direct64.java |   3 +-
 .../org/apache/lucene/util/packed/Direct8.java  |   8 +-
 .../util/packed/DirectMonotonicReader.java      |   4 +-
 .../util/packed/DirectMonotonicWriter.java      |   4 +-
 .../packed/DirectPacked64SingleBlockReader.java |   4 +-
 .../lucene/util/packed/DirectPackedReader.java  |   4 +-
 .../apache/lucene/util/packed/DirectReader.java |   4 +-
 .../apache/lucene/util/packed/DirectWriter.java |   4 +-
 .../lucene/util/packed/GrowableWriter.java      |   4 +-
 .../util/packed/MonotonicBlockPackedReader.java |   4 +-
 .../util/packed/MonotonicBlockPackedWriter.java |   4 +-
 .../lucene/util/packed/MonotonicLongValues.java |   4 +-
 .../lucene/util/packed/Packed16ThreeBlocks.java |   3 +-
 .../org/apache/lucene/util/packed/Packed64.java |   4 +-
 .../lucene/util/packed/Packed64SingleBlock.java |   3 +-
 .../lucene/util/packed/Packed8ThreeBlocks.java  |   3 +-
 .../lucene/util/packed/PackedDataInput.java     |   4 +-
 .../lucene/util/packed/PackedDataOutput.java    |   4 +-
 .../apache/lucene/util/packed/PackedInts.java   |   4 +-
 .../lucene/util/packed/PackedLongValues.java    |   4 +-
 .../util/packed/PackedReaderIterator.java       |   4 +-
 .../apache/lucene/util/packed/PackedWriter.java |   4 +-
 .../lucene/util/packed/PagedGrowableWriter.java |   4 +-
 .../apache/lucene/util/packed/PagedMutable.java |   4 +-
 .../lucene/util/packed/gen_BulkOperation.py     |  79 +-
 .../org/apache/lucene/util/packed/gen_Direct.py |  29 +-
 .../util/packed/gen_Packed64SingleBlock.py      |  45 +-
 .../lucene/util/packed/gen_PackedThreeBlocks.py |  27 +-
 .../test/org/apache/lucene/TestAssertions.java  |   4 +-
 .../src/test/org/apache/lucene/TestDemo.java    |   4 +-
 .../org/apache/lucene/TestExternalCodecs.java   |   4 +-
 .../lucene/TestMergeSchedulerExternal.java      |   4 +-
 .../src/test/org/apache/lucene/TestSearch.java  |   4 +-
 .../apache/lucene/TestSearchForDuplicates.java  |   4 +-
 .../lucene/analysis/TestCachingTokenFilter.java |   4 +-
 .../apache/lucene/analysis/TestCharFilter.java  |   4 +-
 .../lucene/analysis/TestNumericTokenStream.java |   4 +-
 .../analysis/TestReusableStringReader.java      |  12 +-
 .../org/apache/lucene/analysis/TestToken.java   |   4 +-
 .../tokenattributes/TestBytesRefAttImpl.java    |   4 +-
 .../TestCharTermAttributeImpl.java              |   4 +-
 .../TestPackedTokenAttributeImpl.java           |   4 +-
 .../TestSimpleAttributeImpl.java                |   4 +-
 .../lucene/codecs/TestCodecLoadingDeadlock.java |   4 +-
 .../AbstractTestCompressionMode.java            |   4 +-
 .../AbstractTestLZ4CompressionMode.java         |   4 +-
 .../compressing/TestFastCompressionMode.java    |   4 +-
 .../compressing/TestFastDecompressionMode.java  |   4 +-
 .../TestGrowableByteArrayDataOutput.java        |   4 +-
 .../compressing/TestHighCompressionMode.java    |   4 +-
 .../lucene50/TestBlockPostingsFormat.java       |   4 +-
 .../lucene50/TestBlockPostingsFormat2.java      |   4 +-
 .../lucene50/TestBlockPostingsFormat3.java      |   4 +-
 .../lucene/codecs/lucene50/TestForUtil.java     |   4 +-
 .../lucene50/TestLucene50CompoundFormat.java    |   4 +-
 .../lucene50/TestLucene50FieldInfoFormat.java   |   4 +-
 .../lucene50/TestLucene50SegmentInfoFormat.java |   4 +-
 .../TestLucene50StoredFieldsFormat.java         |   4 +-
 ...cene50StoredFieldsFormatHighCompression.java |   4 +-
 .../lucene50/TestLucene50TermVectorsFormat.java |   4 +-
 .../lucene53/TestLucene53NormsFormat.java       |   4 +-
 .../lucene54/TestLucene54DocValuesFormat.java   |   4 +-
 .../lucene60/TestLucene60PointFormat.java       |  83 ++
 .../perfield/TestPerFieldDocValuesFormat.java   |   4 +-
 .../perfield/TestPerFieldPostingsFormat.java    |   4 +-
 .../perfield/TestPerFieldPostingsFormat2.java   |   4 +-
 .../lucene/document/TestBinaryDocument.java     |   4 +-
 .../apache/lucene/document/TestDateTools.java   |  16 +-
 .../apache/lucene/document/TestDocument.java    |   4 +-
 .../org/apache/lucene/document/TestField.java   |   4 +-
 .../apache/lucene/document/TestFieldType.java   |   4 +-
 .../lucene/index/Test2BBinaryDocValues.java     |   4 +-
 .../lucene/index/Test2BNumericDocValues.java    |   4 +-
 .../apache/lucene/index/Test2BPositions.java    |   4 +-
 .../org/apache/lucene/index/Test2BPostings.java |   4 +-
 .../lucene/index/Test2BPostingsBytes.java       |   4 +-
 .../index/Test2BSortedDocValuesFixedSorted.java |   4 +-
 .../lucene/index/Test2BSortedDocValuesOrds.java |   4 +-
 .../org/apache/lucene/index/Test2BTerms.java    |   4 +-
 .../lucene/index/Test4GBStoredFields.java       |   4 +-
 .../org/apache/lucene/index/TestAddIndexes.java |  26 +-
 .../index/TestAllFilesCheckIndexHeader.java     | 142 +++
 .../index/TestAllFilesDetectTruncation.java     | 126 +++
 .../index/TestAllFilesHaveChecksumFooter.java   |  28 +-
 .../index/TestAllFilesHaveCodecHeader.java      |  35 +-
 .../apache/lucene/index/TestAtomicUpdate.java   |  18 +-
 .../apache/lucene/index/TestBagOfPositions.java |   4 +-
 .../apache/lucene/index/TestBagOfPostings.java  |   4 +-
 .../index/TestBinaryDocValuesUpdates.java       |  36 +-
 .../apache/lucene/index/TestBinaryTerms.java    |   4 +-
 .../org/apache/lucene/index/TestByteSlices.java |  12 +-
 .../org/apache/lucene/index/TestCheckIndex.java |   4 +-
 .../lucene/index/TestCodecHoldsOpenFiles.java   |  19 +-
 .../org/apache/lucene/index/TestCodecUtil.java  |   4 +-
 .../org/apache/lucene/index/TestCodecs.java     |   4 +-
 .../index/TestConcurrentMergeScheduler.java     |   8 +-
 .../index/TestConsistentFieldNumbers.java       |   4 +-
 .../test/org/apache/lucene/index/TestCrash.java |   4 +-
 .../index/TestCrashCausesCorruptIndex.java      |   4 +-
 .../apache/lucene/index/TestCustomNorms.java    |   4 +-
 .../apache/lucene/index/TestDeletionPolicy.java |  38 +-
 .../index/TestDemoParallelLeafReader.java       |  18 +-
 .../lucene/index/TestDirectoryReader.java       | 388 ++++----
 .../lucene/index/TestDirectoryReaderReopen.java |  14 +-
 .../test/org/apache/lucene/index/TestDoc.java   |  12 +-
 .../org/apache/lucene/index/TestDocCount.java   |   4 +-
 .../index/TestDocInverterPerFieldErrorInfo.java |   4 +-
 .../org/apache/lucene/index/TestDocValues.java  |   4 +-
 .../lucene/index/TestDocValuesIndexing.java     |   4 +-
 .../lucene/index/TestDocsAndPositions.java      |   4 +-
 .../apache/lucene/index/TestDocumentWriter.java |   4 +-
 .../index/TestDocumentsWriterDeleteQueue.java   |  29 +-
 .../index/TestDocumentsWriterStallControl.java  |  27 +-
 .../apache/lucene/index/TestDuelingCodecs.java  |   4 +-
 .../lucene/index/TestDuelingCodecsAtNight.java  |   4 +-
 .../lucene/index/TestExceedMaxTermLength.java   |   4 +-
 .../index/TestExitableDirectoryReader.java      |   4 +-
 .../org/apache/lucene/index/TestFieldReuse.java |   6 +-
 .../apache/lucene/index/TestFieldsReader.java   |  69 +-
 .../lucene/index/TestFilterDirectoryReader.java |   4 +-
 .../lucene/index/TestFilterLeafReader.java      |   4 +-
 .../test/org/apache/lucene/index/TestFlex.java  |   4 +-
 .../index/TestFlushByRamOrCountsPolicy.java     |   4 +-
 .../lucene/index/TestForTooMuchCloning.java     |   4 +-
 .../lucene/index/TestForceMergeForever.java     |   4 +-
 .../apache/lucene/index/TestIndexCommit.java    |   4 +-
 .../lucene/index/TestIndexFileDeleter.java      |  35 +-
 .../org/apache/lucene/index/TestIndexInput.java |   4 +-
 .../lucene/index/TestIndexReaderClose.java      |   4 +-
 .../apache/lucene/index/TestIndexWriter.java    | 951 +++++++++---------
 .../lucene/index/TestIndexWriterCommit.java     |  24 +-
 .../lucene/index/TestIndexWriterConfig.java     |   4 +-
 .../lucene/index/TestIndexWriterDelete.java     |  13 +-
 .../index/TestIndexWriterDeleteByQuery.java     |   6 +-
 .../lucene/index/TestIndexWriterExceptions.java |  21 +-
 .../index/TestIndexWriterExceptions2.java       |   7 +-
 .../lucene/index/TestIndexWriterForceMerge.java |   5 +-
 .../lucene/index/TestIndexWriterFromReader.java |  21 +-
 .../index/TestIndexWriterLockRelease.java       |   4 +-
 .../lucene/index/TestIndexWriterMaxDocs.java    |   4 +-
 .../index/TestIndexWriterMergePolicy.java       |   4 +-
 .../lucene/index/TestIndexWriterMerging.java    |  17 +-
 .../index/TestIndexWriterNRTIsCurrent.java      |  28 +-
 .../lucene/index/TestIndexWriterOnDiskFull.java |  10 +-
 .../lucene/index/TestIndexWriterOnJRECrash.java |  28 +-
 .../lucene/index/TestIndexWriterOnVMError.java  |   7 +-
 .../TestIndexWriterOutOfFileDescriptors.java    |   6 +-
 .../lucene/index/TestIndexWriterReader.java     |  14 +-
 .../index/TestIndexWriterThreadsToSegments.java |   4 +-
 .../lucene/index/TestIndexWriterUnicode.java    |   4 +-
 .../index/TestIndexWriterWithThreads.java       |   4 +-
 .../apache/lucene/index/TestIndexableField.java |   7 +-
 .../org/apache/lucene/index/TestInfoStream.java |   4 +-
 .../apache/lucene/index/TestIntBlockPool.java   |   4 +-
 .../org/apache/lucene/index/TestIsCurrent.java  |   4 +-
 .../lucene/index/TestLazyProxSkipping.java      |   4 +-
 .../apache/lucene/index/TestLogMergePolicy.java |   4 +-
 .../apache/lucene/index/TestLongPostings.java   |   4 +-
 .../org/apache/lucene/index/TestManyFields.java |   4 +-
 .../apache/lucene/index/TestMaxPosition.java    |   4 +-
 .../lucene/index/TestMaxTermFrequency.java      |   4 +-
 .../lucene/index/TestMergePolicyWrapper.java    |  37 +
 .../lucene/index/TestMergeRateLimiter.java      |   4 +-
 .../apache/lucene/index/TestMixedCodecs.java    |   4 +-
 .../lucene/index/TestMixedDocValuesUpdates.java |  32 +-
 .../apache/lucene/index/TestMultiDocValues.java |   4 +-
 .../apache/lucene/index/TestMultiFields.java    |   4 +-
 .../lucene/index/TestMultiLevelSkipList.java    |   4 +-
 .../apache/lucene/index/TestMultiTermsEnum.java |   4 +-
 .../lucene/index/TestNRTReaderCleanup.java      |  14 +-
 .../lucene/index/TestNRTReaderWithThreads.java  |   4 +-
 .../org/apache/lucene/index/TestNRTThreads.java |   4 +-
 .../apache/lucene/index/TestNeverDelete.java    |  12 +-
 .../apache/lucene/index/TestNewestSegment.java  |   4 +-
 .../lucene/index/TestNoDeletionPolicy.java      |   4 +-
 .../apache/lucene/index/TestNoMergePolicy.java  |  12 +-
 .../lucene/index/TestNoMergeScheduler.java      |   4 +-
 .../test/org/apache/lucene/index/TestNorms.java |   4 +-
 .../index/TestNumericDocValuesUpdates.java      |  36 +-
 .../org/apache/lucene/index/TestOmitNorms.java  |   4 +-
 .../apache/lucene/index/TestOmitPositions.java  |   9 +-
 .../org/apache/lucene/index/TestOmitTf.java     |   9 +-
 .../org/apache/lucene/index/TestOrdinalMap.java |   4 +-
 .../index/TestParallelCompositeReader.java      |   4 +-
 .../lucene/index/TestParallelLeafReader.java    |   4 +-
 .../index/TestParallelReaderEmptyIndex.java     |   4 +-
 .../lucene/index/TestParallelTermEnum.java      |   4 +-
 .../org/apache/lucene/index/TestPayloads.java   |   4 +-
 .../lucene/index/TestPayloadsOnVectors.java     |   4 +-
 .../lucene/index/TestPerSegmentDeletes.java     |   4 +-
 .../TestPersistentSnapshotDeletionPolicy.java   |  29 +-
 .../apache/lucene/index/TestPointValues.java    | 990 +++----------------
 .../lucene/index/TestPostingsOffsets.java       |   4 +-
 .../lucene/index/TestPrefixCodedTerms.java      |   4 +-
 .../apache/lucene/index/TestReadOnlyIndex.java  |   4 +-
 .../apache/lucene/index/TestReaderClosed.java   |   4 +-
 .../index/TestReaderWrapperDVTypeCheck.java     |   1 -
 .../org/apache/lucene/index/TestRollback.java   |   4 +-
 .../apache/lucene/index/TestRollingUpdates.java |   8 +-
 .../lucene/index/TestSameTokenSamePosition.java |   4 +-
 .../apache/lucene/index/TestSegmentInfos.java   |   4 +-
 .../apache/lucene/index/TestSegmentMerger.java  |   4 +-
 .../apache/lucene/index/TestSegmentReader.java  |   4 +-
 .../lucene/index/TestSegmentTermDocs.java       |   4 +-
 .../lucene/index/TestSegmentTermEnum.java       |   4 +-
 .../lucene/index/TestSizeBoundedForceMerge.java |   4 +-
 .../index/TestSnapshotDeletionPolicy.java       |  26 +-
 .../apache/lucene/index/TestStressAdvance.java  |   4 +-
 .../apache/lucene/index/TestStressDeletes.java  |  14 +-
 .../apache/lucene/index/TestStressIndexing.java |  16 +-
 .../lucene/index/TestStressIndexing2.java       |  18 +-
 .../org/apache/lucene/index/TestStressNRT.java  |   6 +-
 .../org/apache/lucene/index/TestSumDocFreq.java |   4 +-
 .../lucene/index/TestSwappedIndexFiles.java     | 128 +++
 .../test/org/apache/lucene/index/TestTerm.java  |   4 +-
 .../apache/lucene/index/TestTermVectors.java    |   4 +-
 .../lucene/index/TestTermVectorsReader.java     |   4 +-
 .../lucene/index/TestTermVectorsWriter.java     |   4 +-
 .../apache/lucene/index/TestTermdocPerf.java    |  15 +-
 .../test/org/apache/lucene/index/TestTerms.java |   4 +-
 .../org/apache/lucene/index/TestTermsEnum.java  |   4 +-
 .../org/apache/lucene/index/TestTermsEnum2.java |   4 +-
 .../lucene/index/TestThreadedForceMerge.java    |   4 +-
 .../lucene/index/TestTieredMergePolicy.java     |   4 +-
 .../index/TestTragicIndexWriterDeadlock.java    |   4 +-
 .../lucene/index/TestTransactionRollback.java   |   4 +-
 .../apache/lucene/index/TestTransactions.java   |   4 +-
 .../org/apache/lucene/index/TestTryDelete.java  |   4 +-
 .../lucene/index/TestTwoPhaseCommitTool.java    |   4 +-
 .../lucene/index/TestUniqueTermCount.java       |   4 +-
 .../index/TestUpgradeIndexMergePolicy.java      |  26 +
 .../lucene/search/BaseTestRangeFilter.java      |   4 +-
 .../apache/lucene/search/JustCompileSearch.java |   4 +-
 .../lucene/search/MultiCollectorTest.java       |   4 +-
 .../TestApproximationSearchEquivalence.java     |   4 +-
 .../lucene/search/TestAutomatonQuery.java       |   4 +-
 .../search/TestAutomatonQueryUnicode.java       |   4 +-
 .../lucene/search/TestBlendedTermQuery.java     |   4 +-
 .../org/apache/lucene/search/TestBoolean2.java  |   4 +-
 .../apache/lucene/search/TestBooleanCoord.java  |   4 +-
 .../search/TestBooleanMinShouldMatch.java       |   4 +-
 .../org/apache/lucene/search/TestBooleanOr.java |   2 +-
 .../apache/lucene/search/TestBooleanQuery.java  |   4 +-
 .../search/TestBooleanQueryVisitSubscorers.java |   4 +-
 .../lucene/search/TestBooleanRewrites.java      |   4 +-
 .../apache/lucene/search/TestBooleanScorer.java |   4 +-
 .../apache/lucene/search/TestBoostQuery.java    |   4 +-
 .../lucene/search/TestCachingCollector.java     |   4 +-
 .../lucene/search/TestComplexExplanations.java  |   4 +-
 .../TestComplexExplanationsOfNonMatches.java    |   4 +-
 .../lucene/search/TestConjunctionDISI.java      |   4 +-
 .../apache/lucene/search/TestConjunctions.java  |   4 +-
 .../lucene/search/TestConstantScoreQuery.java   |   4 +-
 .../TestControlledRealTimeReopenThread.java     |   4 +-
 .../lucene/search/TestCustomSearcherSort.java   |  14 +-
 .../org/apache/lucene/search/TestDateSort.java  |   4 +-
 .../lucene/search/TestDisjunctionMaxQuery.java  |   4 +-
 .../org/apache/lucene/search/TestDocBoost.java  |   4 +-
 .../search/TestDocValuesRewriteMethod.java      |   4 +-
 .../lucene/search/TestDocValuesScoring.java     |   4 +-
 .../lucene/search/TestEarlyTermination.java     |   4 +-
 .../lucene/search/TestElevationComparator.java  |   4 +-
 .../search/TestFieldCacheRewriteMethod.java     |   4 +-
 .../lucene/search/TestFieldValueQuery.java      |   4 +-
 .../apache/lucene/search/TestFuzzyQuery.java    |   4 +-
 .../apache/lucene/search/TestIndexSearcher.java |   4 +-
 .../apache/lucene/search/TestLRUQueryCache.java |   4 +-
 .../lucene/search/TestLiveFieldValues.java      |   4 +-
 .../lucene/search/TestMinShouldMatch2.java      |   4 +-
 .../lucene/search/TestMultiCollector.java       |   4 +-
 .../lucene/search/TestMultiPhraseEnum.java      |   4 +-
 .../lucene/search/TestMultiPhraseQuery.java     |   4 +-
 .../search/TestMultiTermConstantScore.java      |   4 +-
 .../search/TestMultiTermQueryRewrites.java      |   4 +-
 .../search/TestMultiThreadTermVectors.java      |   4 +-
 .../TestMultiValuedNumericRangeQuery.java       |   4 +-
 .../org/apache/lucene/search/TestMultiset.java  |   4 +-
 .../lucene/search/TestNGramPhraseQuery.java     |   4 +-
 .../apache/lucene/search/TestNeedsScores.java   |   4 +-
 .../test/org/apache/lucene/search/TestNot.java  |   4 +-
 .../lucene/search/TestNumericRangeQuery32.java  |   4 +-
 .../lucene/search/TestNumericRangeQuery64.java  |   4 +-
 .../lucene/search/TestPhrasePrefixQuery.java    |   4 +-
 .../apache/lucene/search/TestPhraseQuery.java   |   4 +-
 .../apache/lucene/search/TestPointQueries.java  |  45 +-
 .../lucene/search/TestPositionIncrement.java    |   4 +-
 .../search/TestPositiveScoresOnlyCollector.java |   4 +-
 .../lucene/search/TestPrefixInBooleanQuery.java |   4 +-
 .../apache/lucene/search/TestPrefixQuery.java   |   4 +-
 .../apache/lucene/search/TestPrefixRandom.java  |   4 +-
 .../lucene/search/TestQueryCachingPolicy.java   |   4 +-
 .../apache/lucene/search/TestQueryRescorer.java |   4 +-
 .../apache/lucene/search/TestRegexpQuery.java   |   4 +-
 .../apache/lucene/search/TestRegexpRandom.java  |   4 +-
 .../apache/lucene/search/TestRegexpRandom2.java |   4 +-
 .../lucene/search/TestReqExclBulkScorer.java    |   4 +-
 .../search/TestSameScoresWithThreads.java       |   4 +-
 .../search/TestScoreCachingWrappingScorer.java  |   4 +-
 .../apache/lucene/search/TestScorerPerf.java    |  32 +-
 .../apache/lucene/search/TestSearchAfter.java   |   4 +-
 .../lucene/search/TestSearchWithThreads.java    |   4 +-
 .../lucene/search/TestSearcherManager.java      |   4 +-
 .../lucene/search/TestShardSearching.java       |   4 +-
 .../apache/lucene/search/TestSimilarity.java    |   4 +-
 .../lucene/search/TestSimilarityProvider.java   |   4 +-
 .../lucene/search/TestSimpleExplanations.java   |   4 +-
 .../TestSimpleExplanationsOfNonMatches.java     |   4 +-
 .../search/TestSimpleSearchEquivalence.java     |  14 +-
 .../lucene/search/TestSloppyPhraseQuery.java    |   4 +-
 .../lucene/search/TestSloppyPhraseQuery2.java   |   4 +-
 .../test/org/apache/lucene/search/TestSort.java |   4 +-
 .../apache/lucene/search/TestSortRandom.java    |   4 +-
 .../apache/lucene/search/TestSortRescorer.java  |   4 +-
 .../search/TestSortedNumericSortField.java      |   4 +-
 .../lucene/search/TestSortedSetSelector.java    |   4 +-
 .../lucene/search/TestSortedSetSortField.java   |   4 +-
 .../lucene/search/TestSubScorerFreqs.java       |   4 +-
 .../apache/lucene/search/TestSynonymQuery.java  |   4 +-
 .../lucene/search/TestTermRangeQuery.java       |   4 +-
 .../apache/lucene/search/TestTermScorer.java    |   4 +-
 .../search/TestTimeLimitingCollector.java       |   4 +-
 .../lucene/search/TestTopDocsCollector.java     |   4 +-
 .../apache/lucene/search/TestTopDocsMerge.java  |   4 +-
 .../lucene/search/TestTopFieldCollector.java    |   4 +-
 .../search/TestTotalHitCountCollector.java      |   4 +-
 .../TestUsageTrackingFilterCachingPolicy.java   |   4 +-
 .../org/apache/lucene/search/TestWildcard.java  |   4 +-
 .../lucene/search/TestWildcardRandom.java       |   4 +-
 .../search/similarities/TestBM25Similarity.java |   4 +-
 .../similarities/TestClassicSimilarity.java     |   4 +-
 .../search/similarities/TestSimilarity2.java    |   4 +-
 .../search/similarities/TestSimilarityBase.java |   4 +-
 .../search/spans/JustCompileSearchSpans.java    |   4 +-
 .../apache/lucene/search/spans/TestBasics.java  |   4 +-
 .../search/spans/TestFieldMaskingSpanQuery.java |   4 +-
 .../lucene/search/spans/TestFilterSpans.java    |  27 +-
 .../search/spans/TestNearSpansOrdered.java      |   4 +-
 .../lucene/search/spans/TestSpanBoostQuery.java |  10 +-
 .../lucene/search/spans/TestSpanCollection.java |   4 +-
 .../search/spans/TestSpanContainQuery.java      |   4 +-
 .../search/spans/TestSpanExplanations.java      |   4 +-
 .../spans/TestSpanExplanationsOfNonMatches.java |   4 +-
 .../lucene/search/spans/TestSpanFirstQuery.java |   4 +-
 .../spans/TestSpanMultiTermQueryWrapper.java    |   4 +-
 .../lucene/search/spans/TestSpanNearQuery.java  |   4 +-
 .../lucene/search/spans/TestSpanNotQuery.java   |   4 +-
 .../lucene/search/spans/TestSpanOrQuery.java    |   4 +-
 .../search/spans/TestSpanSearchEquivalence.java |   4 +-
 .../lucene/search/spans/TestSpanTermQuery.java  |   4 +-
 .../apache/lucene/search/spans/TestSpans.java   |   4 +-
 .../lucene/search/spans/TestSpansEnum.java      |   4 +-
 .../lucene/store/TestBufferedChecksum.java      |   4 +-
 .../lucene/store/TestBufferedIndexInput.java    |  90 +-
 .../lucene/store/TestByteArrayDataInput.java    |   4 +-
 .../org/apache/lucene/store/TestDirectory.java  |  23 +-
 .../lucene/store/TestFileSwitchDirectory.java   |   5 +-
 .../lucene/store/TestFilterDirectory.java       |   4 +-
 .../apache/lucene/store/TestHugeRamFile.java    |   4 +-
 .../apache/lucene/store/TestLockFactory.java    |   4 +-
 .../apache/lucene/store/TestMmapDirectory.java  |   4 +-
 .../org/apache/lucene/store/TestMultiMMap.java  |   4 +-
 .../apache/lucene/store/TestNIOFSDirectory.java |   4 +-
 .../lucene/store/TestNRTCachingDirectory.java   |   4 +-
 .../lucene/store/TestNativeFSLockFactory.java   |  25 +-
 .../apache/lucene/store/TestRAMDirectory.java   |   5 +-
 .../apache/lucene/store/TestRateLimiter.java    |   4 +-
 .../lucene/store/TestSimpleFSDirectory.java     |   4 +-
 .../lucene/store/TestSimpleFSLockFactory.java   |   5 +-
 .../store/TestSingleInstanceLockFactory.java    |   4 +-
 .../lucene/store/TestSleepingLockWrapper.java   |   4 +-
 .../store/TestTrackingDirectoryWrapper.java     |   4 +-
 .../apache/lucene/store/TestWindowsMMap.java    |   4 +-
 .../apache/lucene/util/BaseSortTestCase.java    |   4 +-
 .../lucene/util/StressRamUsageEstimator.java    |   4 +-
 .../apache/lucene/util/Test2BPagedBytes.java    |   4 +-
 .../org/apache/lucene/util/TestArrayUtil.java   |   4 +-
 .../apache/lucene/util/TestAttributeSource.java |   4 +-
 .../apache/lucene/util/TestByteBlockPool.java   |  32 +-
 .../org/apache/lucene/util/TestBytesRef.java    |   4 +-
 .../apache/lucene/util/TestBytesRefArray.java   |  27 +-
 .../apache/lucene/util/TestBytesRefHash.java    |   4 +-
 .../org/apache/lucene/util/TestCharsRef.java    |   8 +-
 .../apache/lucene/util/TestCharsRefBuilder.java |   4 +-
 .../lucene/util/TestCloseableThreadLocal.java   |   1 -
 .../apache/lucene/util/TestCollectionUtil.java  |   4 +-
 .../apache/lucene/util/TestDocIdSetBuilder.java |   4 +-
 .../apache/lucene/util/TestFilterIterator.java  |   1 -
 .../lucene/util/TestFixedBitDocIdSet.java       |   1 -
 .../org/apache/lucene/util/TestFixedBitSet.java |   4 +-
 .../util/TestFrequencyTrackingRingBuffer.java   |   4 +-
 .../org/apache/lucene/util/TestIOUtils.java     |   5 +-
 .../lucene/util/TestInPlaceMergeSorter.java     |   4 +-
 .../lucene/util/TestIntArrayDocIdSet.java       |   4 +-
 .../org/apache/lucene/util/TestIntroSorter.java |   4 +-
 .../org/apache/lucene/util/TestIntsRef.java     |   4 +-
 .../apache/lucene/util/TestLSBRadixSorter.java  |   4 +-
 .../lucene/util/TestLegacyNumericUtils.java     |   4 +-
 .../org/apache/lucene/util/TestLongBitSet.java  |   4 +-
 .../org/apache/lucene/util/TestMathUtil.java    |   4 +-
 .../apache/lucene/util/TestMergedIterator.java  |   4 +-
 .../apache/lucene/util/TestNamedSPILoader.java  |  12 +-
 .../org/apache/lucene/util/TestNotDocIdSet.java |   4 +-
 .../apache/lucene/util/TestOfflineSorter.java   |  32 +-
 .../org/apache/lucene/util/TestPagedBytes.java  |   1 -
 .../apache/lucene/util/TestPriorityQueue.java   |   4 +-
 .../apache/lucene/util/TestQueryBuilder.java    |   4 +-
 .../lucene/util/TestRamUsageEstimator.java      |   4 +-
 .../util/TestRecyclingByteBlockAllocator.java   |  18 +-
 .../util/TestRecyclingIntBlockAllocator.java    |  18 +-
 .../apache/lucene/util/TestRoaringDocIdSet.java |   4 +-
 .../apache/lucene/util/TestRollingBuffer.java   |   8 +-
 .../lucene/util/TestSPIClassIterator.java       |   4 +-
 .../apache/lucene/util/TestSentinelIntSet.java  |   6 +-
 .../org/apache/lucene/util/TestSetOnce.java     |   4 +-
 .../org/apache/lucene/util/TestSloppyMath.java  |   4 +-
 .../org/apache/lucene/util/TestSmallFloat.java  |  14 +-
 .../lucene/util/TestSparseFixedBitDocIdSet.java |   4 +-
 .../lucene/util/TestSparseFixedBitSet.java      |   4 +-
 .../apache/lucene/util/TestStringHelper.java    |   4 +-
 .../org/apache/lucene/util/TestTimSorter.java   |   4 +-
 .../lucene/util/TestTimSorterWorstCase.java     |   4 +-
 .../org/apache/lucene/util/TestUnicodeUtil.java |   4 +-
 .../org/apache/lucene/util/TestVersion.java     |   4 +-
 .../apache/lucene/util/TestVirtualMethod.java   |   4 +-
 .../apache/lucene/util/TestWeakIdentityMap.java |   1 -
 .../automaton/FiniteStringsIteratorTest.java    |   4 +-
 .../LimitedFiniteStringsIteratorTest.java       |   4 +-
 .../lucene/util/automaton/TestAutomaton.java    |   4 +-
 .../util/automaton/TestCompiledAutomaton.java   |   4 +-
 .../lucene/util/automaton/TestDeterminism.java  |   4 +-
 .../util/automaton/TestDeterminizeLexicon.java  |   4 +-
 .../util/automaton/TestLevenshteinAutomata.java |   4 +-
 .../lucene/util/automaton/TestMinimize.java     |   4 +-
 .../lucene/util/automaton/TestOperations.java   |   4 +-
 .../lucene/util/automaton/TestRegExp.java       |   4 +-
 .../lucene/util/automaton/TestUTF32ToUTF8.java  |   4 +-
 .../org/apache/lucene/util/bkd/TestBKD.java     |  10 +-
 .../org/apache/lucene/util/fst/Test2BFST.java   |   5 +-
 .../apache/lucene/util/fst/TestBytesStore.java  |   4 +-
 .../org/apache/lucene/util/fst/TestFSTs.java    |   7 +-
 .../lucene/util/packed/TestDirectMonotonic.java |   4 +-
 .../lucene/util/packed/TestDirectPacked.java    |   4 +-
 .../lucene/util/packed/TestPackedInts.java      |   4 +-
 .../java/org/apache/lucene/demo/IndexFiles.java |   4 +-
 .../org/apache/lucene/demo/SearchFiles.java     |   4 +-
 .../demo/facet/AssociationsFacetsExample.java   |   4 +-
 .../demo/facet/DistanceFacetsExample.java       |   4 +-
 .../ExpressionAggregationFacetsExample.java     |  32 +-
 .../facet/MultiCategoryListsFacetsExample.java  |   4 +-
 .../lucene/demo/facet/RangeFacetsExample.java   |   4 +-
 .../lucene/demo/facet/SimpleFacetsExample.java  |   4 +-
 .../facet/SimpleSortedSetFacetsExample.java     |   4 +-
 .../demo/xmlparser/FormBasedXmlQueryDemo.java   |   1 -
 .../test/org/apache/lucene/demo/TestDemo.java   |   4 +-
 .../facet/TestAssociationsFacetsExample.java    |   4 +-
 .../demo/facet/TestDistanceFacetsExample.java   |   4 +-
 .../TestExpressionAggregationFacetsExample.java |   4 +-
 .../TestMultiCategoryListsFacetsExample.java    |   4 +-
 .../demo/facet/TestRangeFacetsExample.java      |   4 +-
 .../demo/facet/TestSimpleFacetsExample.java     |   4 +-
 .../facet/TestSimpleSortedSetFacetsExample.java |   4 +-
 .../org/apache/lucene/expressions/Bindings.java |   2 +-
 .../apache/lucene/expressions/Expression.java   |   2 +-
 .../expressions/ExpressionComparator.java       |   2 +-
 .../expressions/ExpressionFunctionValues.java   |   2 +-
 .../lucene/expressions/ExpressionRescorer.java  |   4 +-
 .../lucene/expressions/ExpressionSortField.java |   2 +-
 .../expressions/ExpressionValueSource.java      |   2 +-
 .../apache/lucene/expressions/FakeScorer.java   |   4 +-
 .../lucene/expressions/ScoreFunctionValues.java |   2 +-
 .../lucene/expressions/ScoreValueSource.java    |   4 +-
 .../lucene/expressions/SimpleBindings.java      |   4 +-
 .../expressions/js/JavascriptCompiler.java      |   2 +-
 .../js/JavascriptErrorHandlingLexer.java        |   4 +-
 .../js/JavascriptParserErrorStrategy.java       |   4 +-
 .../lucene/expressions/js/VariableContext.java  |   4 +-
 .../lucene/expressions/TestDemoExpressions.java |  32 +-
 .../expressions/TestExpressionRescorer.java     |   4 +-
 .../expressions/TestExpressionSortField.java    |   4 +-
 .../lucene/expressions/TestExpressionSorts.java |   4 +-
 .../expressions/TestExpressionValidation.java   |   4 +-
 .../expressions/TestExpressionValueSource.java  |   4 +-
 .../expressions/js/TestCustomFunctions.java     |   4 +-
 .../expressions/js/TestJavascriptCompiler.java  |   2 +-
 .../expressions/js/TestJavascriptFunction.java  |   2 +-
 .../js/TestJavascriptOperations.java            |   2 +-
 .../expressions/js/TestVariableContext.java     |   4 +-
 .../org/apache/lucene/facet/DrillDownQuery.java |   3 +-
 .../org/apache/lucene/facet/DrillSideways.java  |   3 +-
 .../apache/lucene/facet/DrillSidewaysQuery.java |   4 +-
 .../lucene/facet/DrillSidewaysScorer.java       |   3 +-
 .../org/apache/lucene/facet/FacetField.java     |   3 +-
 .../org/apache/lucene/facet/FacetResult.java    |   3 +-
 .../java/org/apache/lucene/facet/Facets.java    |   3 +-
 .../apache/lucene/facet/FacetsCollector.java    |   3 +-
 .../org/apache/lucene/facet/FacetsConfig.java   |   4 +-
 .../org/apache/lucene/facet/LabelAndValue.java  |   3 +-
 .../org/apache/lucene/facet/MultiFacets.java    |   3 +-
 .../facet/RandomSamplingFacetsCollector.java    |   3 +-
 .../lucene/facet/TopOrdAndFloatQueue.java       |   3 +-
 .../apache/lucene/facet/TopOrdAndIntQueue.java  |   3 +-
 .../apache/lucene/facet/range/DoubleRange.java  |   3 +-
 .../facet/range/DoubleRangeFacetCounts.java     |   3 +-
 .../apache/lucene/facet/range/LongRange.java    |   3 +-
 .../lucene/facet/range/LongRangeCounter.java    |   3 +-
 .../facet/range/LongRangeFacetCounts.java       |   3 +-
 .../org/apache/lucene/facet/range/Range.java    |   3 +-
 .../lucene/facet/range/RangeFacetCounts.java    |   3 +-
 .../DefaultSortedSetDocValuesReaderState.java   |   3 +-
 .../SortedSetDocValuesFacetCounts.java          |   3 +-
 .../sortedset/SortedSetDocValuesFacetField.java |   3 +-
 .../SortedSetDocValuesReaderState.java          |   3 +-
 .../facet/taxonomy/AssociationFacetField.java   |   3 +-
 .../facet/taxonomy/CachedOrdinalsReader.java    |   3 +-
 .../facet/taxonomy/DocValuesOrdinalsReader.java |   4 +-
 .../lucene/facet/taxonomy/FacetLabel.java       |   3 +-
 .../lucene/facet/taxonomy/FakeScorer.java       |   3 +-
 .../facet/taxonomy/FastTaxonomyFacetCounts.java |   3 +-
 .../taxonomy/FloatAssociationFacetField.java    |   3 +-
 .../facet/taxonomy/FloatTaxonomyFacets.java     |   3 +-
 .../taxonomy/IntAssociationFacetField.java      |   3 +-
 .../facet/taxonomy/IntTaxonomyFacets.java       |   3 +-
 .../lucene/facet/taxonomy/LRUHashMap.java       |   3 +-
 .../taxonomy/OrdinalMappingLeafReader.java      |   3 +-
 .../lucene/facet/taxonomy/OrdinalsReader.java   |   3 +-
 .../facet/taxonomy/ParallelTaxonomyArrays.java  |   4 +-
 .../facet/taxonomy/PrintTaxonomyStats.java      |   3 +-
 .../facet/taxonomy/SearcherTaxonomyManager.java |   3 +-
 .../facet/taxonomy/TaxonomyFacetCounts.java     |   3 +-
 .../TaxonomyFacetSumFloatAssociations.java      |   3 +-
 .../TaxonomyFacetSumIntAssociations.java        |   3 +-
 .../taxonomy/TaxonomyFacetSumValueSource.java   |   3 +-
 .../lucene/facet/taxonomy/TaxonomyFacets.java   |   3 +-
 .../facet/taxonomy/TaxonomyMergeUtils.java      |  31 +-
 .../lucene/facet/taxonomy/TaxonomyReader.java   |  17 +-
 .../lucene/facet/taxonomy/TaxonomyWriter.java   |  15 +-
 .../lucene/facet/taxonomy/directory/Consts.java |   7 +-
 .../directory/DirectoryTaxonomyReader.java      |  33 +-
 .../directory/DirectoryTaxonomyWriter.java      |  33 +-
 .../taxonomy/directory/TaxonomyIndexArrays.java |  25 +-
 .../taxonomy/writercache/CategoryPathUtils.java |   7 +-
 .../taxonomy/writercache/CharBlockArray.java    |  21 +-
 .../writercache/Cl2oTaxonomyWriterCache.java    |  15 +-
 .../taxonomy/writercache/CollisionMap.java      |  13 +-
 .../writercache/CompactLabelToOrdinal.java      |   3 +-
 .../taxonomy/writercache/LabelToOrdinal.java    |   7 +-
 .../writercache/LruTaxonomyWriterCache.java     |   9 +-
 .../writercache/NameHashIntCacheLRU.java        |   7 +-
 .../taxonomy/writercache/NameIntCacheLRU.java   |  13 +-
 .../writercache/TaxonomyWriterCache.java        |   9 +-
 .../facet/AssertingSubDocsAtOnceCollector.java  |   3 +-
 .../org/apache/lucene/facet/FacetTestCase.java  |   3 +-
 .../apache/lucene/facet/SlowRAMDirectory.java   |   3 +-
 .../apache/lucene/facet/TestDrillDownQuery.java |   3 +-
 .../apache/lucene/facet/TestDrillSideways.java  |   3 +-
 .../apache/lucene/facet/TestFacetsConfig.java   |   3 +-
 .../lucene/facet/TestMultipleIndexFields.java   |   3 +-
 .../TestRandomSamplingFacetsCollector.java      |  33 +-
 .../facet/range/TestRangeFacetCounts.java       |   3 +-
 .../sortedset/TestSortedSetDocValuesFacets.java |   3 +-
 .../taxonomy/TestCachedOrdinalsReader.java      |   3 +-
 .../lucene/facet/taxonomy/TestFacetLabel.java   |  21 +-
 .../lucene/facet/taxonomy/TestLRUHashMap.java   |   3 +-
 .../taxonomy/TestOrdinalMappingLeafReader.java  |  33 +-
 .../taxonomy/TestSearcherTaxonomyManager.java   |   3 +-
 .../facet/taxonomy/TestTaxonomyCombined.java    |  33 +-
 .../taxonomy/TestTaxonomyFacetAssociations.java |   4 +-
 .../facet/taxonomy/TestTaxonomyFacetCounts.java |   3 +-
 .../taxonomy/TestTaxonomyFacetCounts2.java      |   3 +-
 .../TestTaxonomyFacetSumValueSource.java        |   3 +-
 .../taxonomy/directory/TestAddTaxonomy.java     |  42 +-
 .../TestConcurrentFacetedIndexing.java          |  33 +-
 .../directory/TestDirectoryTaxonomyReader.java  |  33 +-
 .../directory/TestDirectoryTaxonomyWriter.java  |  32 +-
 .../writercache/TestCharBlockArray.java         |  30 +-
 .../writercache/TestCompactLabelToOrdinal.java  |  33 +-
 .../AbstractAllGroupHeadsCollector.java         |   3 +-
 .../grouping/AbstractAllGroupsCollector.java    |   3 +-
 .../AbstractDistinctValuesCollector.java        |   3 +-
 .../AbstractFirstPassGroupingCollector.java     |   3 +-
 .../grouping/AbstractGroupFacetCollector.java   |   3 +-
 .../AbstractSecondPassGroupingCollector.java    |   3 +-
 .../search/grouping/BlockGroupingCollector.java |   3 +-
 .../search/grouping/CollectedSearchGroup.java   |   1 -
 .../lucene/search/grouping/FakeScorer.java      |   3 +-
 .../lucene/search/grouping/GroupDocs.java       |   3 +-
 .../lucene/search/grouping/GroupingSearch.java  |   3 +-
 .../lucene/search/grouping/SearchGroup.java     |   3 +-
 .../lucene/search/grouping/TopGroups.java       |   3 +-
 .../FunctionAllGroupHeadsCollector.java         |   3 +-
 .../function/FunctionAllGroupsCollector.java    |   3 +-
 .../FunctionDistinctValuesCollector.java        |   3 +-
 .../FunctionFirstPassGroupingCollector.java     |   3 +-
 .../FunctionSecondPassGroupingCollector.java    |   3 +-
 .../term/TermAllGroupHeadsCollector.java        |   3 +-
 .../grouping/term/TermAllGroupsCollector.java   |   3 +-
 .../term/TermDistinctValuesCollector.java       |   3 +-
 .../term/TermFirstPassGroupingCollector.java    |   3 +-
 .../grouping/term/TermGroupFacetCollector.java  |   3 +-
 .../term/TermSecondPassGroupingCollector.java   |   3 +-
 .../grouping/AbstractGroupingTestCase.java      |   3 +-
 .../grouping/AllGroupHeadsCollectorTest.java    |   3 +-
 .../search/grouping/AllGroupsCollectorTest.java |   5 +-
 .../grouping/DistinctValuesCollectorTest.java   |   3 +-
 .../grouping/GroupFacetCollectorTest.java       |   3 +-
 .../search/grouping/GroupingSearchTest.java     |   3 +-
 .../lucene/search/grouping/TestGrouping.java    |   1 -
 .../lucene/search/highlight/DefaultEncoder.java |  22 +-
 .../apache/lucene/search/highlight/Encoder.java |  17 +-
 .../lucene/search/highlight/Formatter.java      |   4 +-
 .../lucene/search/highlight/Fragmenter.java     |   3 +-
 .../search/highlight/GradientFormatter.java     |   3 +-
 .../lucene/search/highlight/Highlighter.java    |   3 +-
 .../highlight/InvalidTokenOffsetsException.java |   3 +-
 .../lucene/search/highlight/NullFragmenter.java |   3 +-
 .../highlight/OffsetLimitTokenFilter.java       |   3 +-
 .../lucene/search/highlight/PositionSpan.java   |   3 +-
 .../lucene/search/highlight/QueryScorer.java    |   3 +-
 .../search/highlight/QueryTermExtractor.java    |   3 +-
 .../search/highlight/QueryTermScorer.java       |   3 +-
 .../apache/lucene/search/highlight/Scorer.java  |   3 +-
 .../search/highlight/SimpleFragmenter.java      |   3 +-
 .../search/highlight/SimpleHTMLEncoder.java     |  19 +-
 .../search/highlight/SimpleHTMLFormatter.java   |   3 +-
 .../search/highlight/SimpleSpanFragmenter.java  |   6 +-
 .../search/highlight/SpanGradientFormatter.java |   3 +-
 .../search/highlight/TermVectorLeafReader.java  |   3 +-
 .../lucene/search/highlight/TextFragment.java   |   4 +-
 .../lucene/search/highlight/TokenGroup.java     |   3 +-
 .../lucene/search/highlight/TokenSources.java   |   3 +-
 .../highlight/TokenStreamFromTermVector.java    |   3 +-
 .../search/highlight/WeightedSpanTerm.java      |   6 +-
 .../highlight/WeightedSpanTermExtractor.java    |   3 +-
 .../lucene/search/highlight/WeightedTerm.java   |   3 +-
 .../CustomSeparatorBreakIterator.java           |   9 +-
 .../DefaultPassageFormatter.java                |   3 +-
 .../MultiTermHighlighting.java                  |   3 +-
 .../search/postingshighlight/Passage.java       |   3 +-
 .../postingshighlight/PassageFormatter.java     |   3 +-
 .../search/postingshighlight/PassageScorer.java |   3 +-
 .../postingshighlight/PostingsHighlighter.java  |   3 +-
 .../postingshighlight/WholeBreakIterator.java   |   3 +-
 .../vectorhighlight/BaseFragListBuilder.java    |   3 +-
 .../vectorhighlight/BaseFragmentsBuilder.java   |   3 +-
 .../search/vectorhighlight/BoundaryScanner.java |   3 +-
 .../BreakIteratorBoundaryScanner.java           |   3 +-
 .../vectorhighlight/FastVectorHighlighter.java  |   3 +-
 .../search/vectorhighlight/FieldFragList.java   |   3 +-
 .../search/vectorhighlight/FieldPhraseList.java |   3 +-
 .../search/vectorhighlight/FieldQuery.java      |   3 +-
 .../search/vectorhighlight/FieldTermStack.java  |   3 +-
 .../search/vectorhighlight/FragListBuilder.java |   3 +-
 .../vectorhighlight/FragmentsBuilder.java       |   3 +-
 .../ScoreOrderFragmentsBuilder.java             |   3 +-
 .../vectorhighlight/SimpleBoundaryScanner.java  |   3 +-
 .../vectorhighlight/SimpleFieldFragList.java    |   3 +-
 .../vectorhighlight/SimpleFragListBuilder.java  |   4 +-
 .../vectorhighlight/SimpleFragmentsBuilder.java |   3 +-
 .../vectorhighlight/SingleFragListBuilder.java  |   3 +-
 .../vectorhighlight/WeightedFieldFragList.java  |   3 +-
 .../WeightedFragListBuilder.java                |   3 +-
 .../search/highlight/HighlighterPhraseTest.java |   3 +-
 .../search/highlight/HighlighterTest.java       |   3 +-
 .../lucene/search/highlight/MissesTest.java     |   3 +-
 .../highlight/OffsetLimitTokenFilterTest.java   |   3 +-
 .../search/highlight/TokenSourcesTest.java      |   3 +-
 .../custom/HighlightCustomQueryTest.java        |   4 +-
 .../TestCustomSeparatorBreakIterator.java       |   3 +-
 .../TestMultiTermHighlighting.java              |   3 +-
 .../TestPostingsHighlighter.java                |   3 +-
 .../TestPostingsHighlighterRanking.java         |   3 +-
 .../TestWholeBreakIterator.java                 |   3 +-
 .../vectorhighlight/AbstractTestCase.java       |   3 +-
 .../BreakIteratorBoundaryScannerTest.java       |   3 +-
 .../FastVectorHighlighterTest.java              |   2 +-
 .../vectorhighlight/FieldPhraseListTest.java    |   3 +-
 .../search/vectorhighlight/FieldQueryTest.java  |   3 +-
 .../vectorhighlight/FieldTermStackTest.java     |   3 +-
 .../vectorhighlight/IndexTimeSynonymTest.java   |   3 +-
 .../ScoreOrderFragmentsBuilderTest.java         |   3 +-
 .../SimpleBoundaryScannerTest.java              |   3 +-
 .../SimpleFragListBuilderTest.java              |   3 +-
 .../SimpleFragmentsBuilderTest.java             |   3 +-
 .../SingleFragListBuilderTest.java              |  11 +-
 .../WeightedFragListBuilderTest.java            |   3 +-
 .../search/join/BaseGlobalOrdinalScorer.java    |   3 +-
 .../lucene/search/join/BitSetProducer.java      |   3 +-
 .../lucene/search/join/BlockJoinSelector.java   |   3 +-
 .../lucene/search/join/CheckJoinIndex.java      |   3 +-
 .../search/join/DocValuesTermsCollector.java    |  33 +-
 .../apache/lucene/search/join/FakeScorer.java   |   3 +-
 .../search/join/GenericTermsCollector.java      |  31 +-
 .../search/join/GlobalOrdinalsCollector.java    |   3 +-
 .../lucene/search/join/GlobalOrdinalsQuery.java |   3 +-
 .../join/GlobalOrdinalsWithScoreCollector.java  |   3 +-
 .../join/GlobalOrdinalsWithScoreQuery.java      |   3 +-
 .../org/apache/lucene/search/join/JoinUtil.java |  17 +-
 .../lucene/search/join/QueryBitSetProducer.java |   3 +-
 .../apache/lucene/search/join/ScoreMode.java    |   3 +-
 .../lucene/search/join/TermsCollector.java      |   3 +-
 .../search/join/TermsIncludingScoreQuery.java   |   3 +-
 .../apache/lucene/search/join/TermsQuery.java   |   3 +-
 .../search/join/TermsWithScoreCollector.java    |   9 +-
 .../search/join/ToChildBlockJoinQuery.java      |   3 +-
 .../search/join/ToParentBlockJoinCollector.java |   3 +-
 .../join/ToParentBlockJoinIndexSearcher.java    |   3 +-
 .../search/join/ToParentBlockJoinQuery.java     |   3 +-
 .../search/join/ToParentBlockJoinSortField.java |   3 +-
 .../lucene/search/join/TestBlockJoin.java       |   3 +-
 .../search/join/TestBlockJoinSelector.java      |   4 +-
 .../search/join/TestBlockJoinSorting.java       |   3 +-
 .../search/join/TestBlockJoinValidation.java    |   3 +-
 .../lucene/search/join/TestCheckJoinIndex.java  |   3 +-
 .../apache/lucene/search/join/TestJoinUtil.java |  33 +-
 .../apache/lucene/index/memory/MemoryIndex.java | 110 ++-
 .../lucene/index/memory/TestMemoryIndex.java    |  30 +-
 .../memory/TestMemoryIndexAgainstRAMDir.java    |   3 +-
 .../apache/lucene/document/LazyDocument.java    |  17 +-
 .../apache/lucene/index/MergeReaderWrapper.java |   3 +-
 .../lucene/index/MultiPassIndexSplitter.java    |   3 +-
 .../apache/lucene/index/PKIndexSplitter.java    |   3 +-
 .../java/org/apache/lucene/index/Sorter.java    |   3 +-
 .../apache/lucene/index/SortingLeafReader.java  |   3 +-
 .../apache/lucene/index/SortingMergePolicy.java |  20 +-
 .../org/apache/lucene/misc/GetTermInfo.java     |   3 +-
 .../org/apache/lucene/misc/HighFreqTerms.java   |   3 +-
 .../org/apache/lucene/misc/IndexMergeTool.java  |  14 +-
 .../apache/lucene/misc/SweetSpotSimilarity.java |   1 -
 .../java/org/apache/lucene/misc/TermStats.java  |   3 +-
 .../search/BlockJoinComparatorSource.java       |   3 +-
 .../search/DiversifiedTopDocsCollector.java     |   4 +-
 .../EarlyTerminatingSortingCollector.java       |   3 +-
 .../apache/lucene/store/NativePosixUtil.java    |   3 +-
 .../lucene/store/NativeUnixDirectory.java       |  28 +-
 .../org/apache/lucene/store/RAFDirectory.java   |   4 +-
 .../apache/lucene/store/WindowsDirectory.java   |  27 +-
 .../apache/lucene/uninverting/DocTermOrds.java  |   1 -
 .../apache/lucene/uninverting/FieldCache.java   |   3 +-
 .../lucene/uninverting/FieldCacheImpl.java      |   3 +-
 .../uninverting/FieldCacheSanityChecker.java    |  13 +-
 .../lucene/uninverting/UninvertingReader.java   |   3 +-
 .../apache/lucene/util/fst/ListOfOutputs.java   |   3 +-
 .../util/fst/UpToTwoPositiveIntOutputs.java     |   3 +-
 .../apache/lucene/index/IndexSortingTest.java   |   3 +-
 .../org/apache/lucene/index/SorterTestBase.java |   3 +-
 .../lucene/index/SortingLeafReaderTest.java     |   3 +-
 .../lucene/index/TestBlockJoinSorter.java       |   3 +-
 .../index/TestMultiPassIndexSplitter.java       |   3 +-
 .../lucene/index/TestPKIndexSplitter.java       |  27 +-
 .../lucene/index/TestSortingMergePolicy.java    |  22 +-
 .../lucene/misc/SweetSpotSimilarityTest.java    |   3 -
 .../apache/lucene/misc/TestHighFreqTerms.java   |   3 +-
 .../search/TestDiversifiedTopDocsCollector.java |   3 +-
 .../TestEarlyTerminatingSortingCollector.java   |   3 +-
 .../apache/lucene/store/TestRAFDirectory.java   |   3 +-
 .../lucene/uninverting/TestDocTermOrds.java     |   3 +-
 .../lucene/uninverting/TestFieldCache.java      |  14 +-
 .../uninverting/TestFieldCacheReopen.java       |   3 +-
 .../TestFieldCacheSanityChecker.java            |  14 +-
 .../lucene/uninverting/TestFieldCacheSort.java  |   3 +-
 .../uninverting/TestFieldCacheSortRandom.java   |   3 +-
 .../uninverting/TestFieldCacheVsDocValues.java  |   3 +-
 .../uninverting/TestFieldCacheWithThreads.java  |   3 +-
 .../lucene/uninverting/TestNumericTerms32.java  |   3 +-
 .../lucene/uninverting/TestNumericTerms64.java  |   3 +-
 .../uninverting/TestUninvertingReader.java      |   3 +-
 .../apache/lucene/util/fst/TestFSTsMisc.java    |   4 +-
 .../apache/lucene/queries/BoostingQuery.java    |   3 +-
 .../apache/lucene/queries/CommonTermsQuery.java |   4 +-
 .../lucene/queries/CustomScoreProvider.java     |   3 +-
 .../apache/lucene/queries/CustomScoreQuery.java |   3 +-
 .../org/apache/lucene/queries/TermsQuery.java   |  55 +-
 .../lucene/queries/function/BoostedQuery.java   |   3 +-
 .../lucene/queries/function/FunctionQuery.java  |   3 +-
 .../queries/function/FunctionRangeQuery.java    |   3 +-
 .../lucene/queries/function/FunctionValues.java |   3 +-
 .../lucene/queries/function/ValueSource.java    |   3 +-
 .../queries/function/ValueSourceScorer.java     |   3 +-
 .../function/docvalues/BoolDocValues.java       |   3 +-
 .../docvalues/DocTermsIndexDocValues.java       |   1 -
 .../function/docvalues/DoubleDocValues.java     |   3 +-
 .../function/docvalues/FloatDocValues.java      |   3 +-
 .../function/docvalues/IntDocValues.java        |   3 +-
 .../function/docvalues/LongDocValues.java       |   3 +-
 .../function/docvalues/StrDocValues.java        |   3 +-
 .../function/valuesource/BoolFunction.java      |   1 -
 .../valuesource/BytesRefFieldSource.java        |   3 +-
 .../function/valuesource/ConstNumberSource.java |   1 -
 .../function/valuesource/ConstValueSource.java  |   1 -
 .../function/valuesource/DefFunction.java       |   3 +-
 .../function/valuesource/DivFloatFunction.java  |   1 -
 .../valuesource/DocFreqValueSource.java         |   1 -
 .../valuesource/DoubleConstValueSource.java     |   1 -
 .../function/valuesource/DoubleFieldSource.java |   1 -
 .../function/valuesource/DualFloatFunction.java |   1 -
 .../function/valuesource/EnumFieldSource.java   |   3 +-
 .../function/valuesource/FieldCacheSource.java  |   1 -
 .../function/valuesource/FloatFieldSource.java  |   1 -
 .../function/valuesource/IDFValueSource.java    |   1 -
 .../function/valuesource/IfFunction.java        |   1 -
 .../function/valuesource/IntFieldSource.java    |   1 -
 .../valuesource/JoinDocFreqValueSource.java     |   1 -
 .../valuesource/LinearFloatFunction.java        |   1 -
 .../valuesource/LiteralValueSource.java         |   3 +-
 .../function/valuesource/LongFieldSource.java   |   1 -
 .../function/valuesource/MaxFloatFunction.java  |   1 -
 .../function/valuesource/MinFloatFunction.java  |   1 -
 .../function/valuesource/MultiBoolFunction.java |   1 -
 .../valuesource/MultiFloatFunction.java         |   3 +-
 .../function/valuesource/MultiFunction.java     |   3 +-
 .../function/valuesource/MultiValueSource.java  |   3 +-
 .../function/valuesource/NormValueSource.java   |   1 -
 .../function/valuesource/PowFloatFunction.java  |   1 -
 .../valuesource/ProductFloatFunction.java       |   1 -
 .../function/valuesource/QueryValueSource.java  |   1 -
 .../valuesource/RangeMapFloatFunction.java      |   1 -
 .../valuesource/ReciprocalFloatFunction.java    |   1 -
 .../valuesource/ScaleFloatFunction.java         |   1 -
 .../valuesource/SimpleBoolFunction.java         |   1 -
 .../valuesource/SimpleFloatFunction.java        |   1 -
 .../function/valuesource/SingleFunction.java    |   1 -
 .../valuesource/SortedSetFieldSource.java       |   3 +-
 .../function/valuesource/SumFloatFunction.java  |   1 -
 .../SumTotalTermFreqValueSource.java            |   1 -
 .../function/valuesource/TFValueSource.java     |   3 +-
 .../valuesource/TermFreqValueSource.java        |   1 -
 .../valuesource/TotalTermFreqValueSource.java   |   1 -
 .../function/valuesource/VectorValueSource.java |   3 +-
 .../apache/lucene/queries/mlt/MoreLikeThis.java |  14 +-
 .../lucene/queries/mlt/MoreLikeThisQuery.java   |   6 +-
 .../payloads/AveragePayloadFunction.java        |   4 +-
 .../queries/payloads/MaxPayloadFunction.java    |   4 +-
 .../queries/payloads/MinPayloadFunction.java    |   3 +-
 .../queries/payloads/PayloadFunction.java       |   3 +-
 .../queries/payloads/PayloadScoreQuery.java     |   3 +-
 .../queries/payloads/SpanPayloadCheckQuery.java |   3 +-
 .../lucene/queries/BoostingQueryTest.java       |   3 +-
 .../lucene/queries/CommonTermsQueryTest.java    |   9 +-
 .../apache/lucene/queries/TermsQueryTest.java   |   3 +-
 .../queries/TestCustomScoreExplanations.java    |   3 +-
 .../lucene/queries/TestCustomScoreQuery.java    |   3 +-
 .../queries/function/FunctionTestSetup.java     |  32 +-
 .../queries/function/TestBoostedQuery.java      |  33 +-
 .../function/TestDocValuesFieldSources.java     |   3 +-
 .../queries/function/TestFieldScoreQuery.java   |   3 +-
 .../function/TestFunctionQueryExplanations.java |   3 +-
 .../queries/function/TestFunctionQuerySort.java |   3 +-
 .../function/TestFunctionRangeQuery.java        |   3 +-
 .../function/TestLongNormValueSource.java       |   3 +-
 .../function/TestSortedSetFieldSource.java      |   3 +-
 .../queries/function/TestValueSources.java      |   3 +-
 .../lucene/queries/mlt/TestMoreLikeThis.java    |   3 +-
 .../lucene/queries/payloads/PayloadHelper.java  |   3 +-
 .../queries/payloads/TestPayloadCheckQuery.java |   3 +-
 .../payloads/TestPayloadExplanations.java       |   3 +-
 .../queries/payloads/TestPayloadScoreQuery.java |   3 +-
 .../queries/payloads/TestPayloadSpans.java      |  14 +-
 .../queries/payloads/TestPayloadTermQuery.java  |   3 +-
 .../analyzing/AnalyzingQueryParser.java         |   3 +-
 .../queryparser/classic/FastCharStream.java     |   5 +-
 .../classic/MultiFieldQueryParser.java          |   3 +-
 .../queryparser/classic/QueryParserBase.java    |   1 -
 .../complexPhrase/ComplexPhraseQueryParser.java |   3 +-
 .../queryparser/ext/ExtendableQueryParser.java  |   3 +-
 .../lucene/queryparser/ext/ExtensionQuery.java  |   7 +-
 .../lucene/queryparser/ext/Extensions.java      |   4 +-
 .../lucene/queryparser/ext/ParserExtension.java |   3 +-
 .../flexible/core/QueryNodeError.java           |   3 +-
 .../flexible/core/QueryNodeException.java       |   3 +-
 .../flexible/core/QueryNodeParseException.java  |   3 +-
 .../flexible/core/QueryParserHelper.java        |  16 +-
 .../flexible/core/builders/QueryBuilder.java    |   8 +-
 .../core/builders/QueryTreeBuilder.java         |   3 +-
 .../core/config/AbstractQueryConfig.java        |   3 +-
 .../flexible/core/config/ConfigurationKey.java  |   3 +-
 .../flexible/core/config/FieldConfig.java       |   3 +-
 .../core/config/FieldConfigListener.java        |   3 +-
 .../core/config/QueryConfigHandler.java         |   3 +-
 .../core/messages/QueryParserMessages.java      |   3 +-
 .../flexible/core/nodes/AndQueryNode.java       |   3 +-
 .../flexible/core/nodes/AnyQueryNode.java       |   3 +-
 .../flexible/core/nodes/BooleanQueryNode.java   |   3 +-
 .../flexible/core/nodes/BoostQueryNode.java     |   3 +-
 .../flexible/core/nodes/DeletedQueryNode.java   |   7 +-
 .../flexible/core/nodes/FieldQueryNode.java     |   3 +-
 .../core/nodes/FieldValuePairQueryNode.java     |   3 +-
 .../flexible/core/nodes/FieldableNode.java      |   3 +-
 .../flexible/core/nodes/FuzzyQueryNode.java     |   3 +-
 .../flexible/core/nodes/GroupQueryNode.java     |   3 +-
 .../core/nodes/MatchAllDocsQueryNode.java       |   3 +-
 .../core/nodes/MatchNoDocsQueryNode.java        |   3 +-
 .../flexible/core/nodes/ModifierQueryNode.java  |   3 +-
 .../core/nodes/NoTokenFoundQueryNode.java       |   3 +-
 .../flexible/core/nodes/OpaqueQueryNode.java    |   3 +-
 .../flexible/core/nodes/OrQueryNode.java        |   3 +-
 .../flexible/core/nodes/PathQueryNode.java      |   3 +-
 .../core/nodes/PhraseSlopQueryNode.java         |   3 +-
 .../flexible/core/nodes/ProximityQueryNode.java |   3 +-
 .../flexible/core/nodes/QueryNode.java          |   3 +-
 .../flexible/core/nodes/QueryNodeImpl.java      |   3 +-
 .../core/nodes/QuotedFieldQueryNode.java        |   3 +-
 .../flexible/core/nodes/RangeQueryNode.java     |   7 +-
 .../flexible/core/nodes/SlopQueryNode.java      |   3 +-
 .../flexible/core/nodes/TextableQueryNode.java  |  27 +-
 .../core/nodes/TokenizedPhraseQueryNode.java    |   3 +-
 .../flexible/core/nodes/ValueQueryNode.java     |  27 +-
 .../flexible/core/parser/EscapeQuerySyntax.java |   3 +-
 .../flexible/core/parser/SyntaxParser.java      |   3 +-
 .../NoChildOptimizationQueryNodeProcessor.java  |   3 +-
 .../core/processors/QueryNodeProcessor.java     |   3 +-
 .../core/processors/QueryNodeProcessorImpl.java |   3 +-
 .../processors/QueryNodeProcessorPipeline.java  |   3 +-
 .../RemoveDeletedQueryNodesProcessor.java       |   3 +-
 .../flexible/core/util/QueryNodeOperation.java  |   3 +-
 .../flexible/core/util/StringUtils.java         |   3 +-
 .../core/util/UnescapedCharSequence.java        |   7 +-
 .../queryparser/flexible/messages/Message.java  |   3 +-
 .../flexible/messages/MessageImpl.java          |   3 +-
 .../queryparser/flexible/messages/NLS.java      |   3 +-
 .../flexible/messages/NLSException.java         |   3 +-
 .../precedence/PrecedenceQueryParser.java       |   3 +-
 .../BooleanModifiersQueryNodeProcessor.java     |   3 +-
 .../PrecedenceQueryNodeProcessorPipeline.java   |   3 +-
 .../CommonQueryParserConfiguration.java         |  23 +-
 .../flexible/standard/QueryParserUtil.java      |   3 +-
 .../flexible/standard/StandardQueryParser.java  |   3 +-
 .../standard/builders/AnyQueryNodeBuilder.java  |   3 +-
 .../builders/BooleanQueryNodeBuilder.java       |   3 +-
 .../builders/BoostQueryNodeBuilder.java         |   3 +-
 .../builders/DummyQueryNodeBuilder.java         |   3 +-
 .../builders/FieldQueryNodeBuilder.java         |   3 +-
 .../builders/FuzzyQueryNodeBuilder.java         |   3 +-
 .../builders/GroupQueryNodeBuilder.java         |   3 +-
 .../builders/MatchAllDocsQueryNodeBuilder.java  |   3 +-
 .../builders/MatchNoDocsQueryNodeBuilder.java   |   3 +-
 .../builders/ModifierQueryNodeBuilder.java      |   3 +-
 .../builders/MultiPhraseQueryNodeBuilder.java   |   3 +-
 .../builders/NumericRangeQueryNodeBuilder.java  |   3 +-
 .../builders/PhraseQueryNodeBuilder.java        |   3 +-
 .../PrefixWildcardQueryNodeBuilder.java         |   3 +-
 .../builders/RegexpQueryNodeBuilder.java        |   3 +-
 .../standard/builders/SlopQueryNodeBuilder.java |   3 +-
 .../StandardBooleanQueryNodeBuilder.java        |   3 +-
 .../standard/builders/StandardQueryBuilder.java |   3 +-
 .../builders/StandardQueryTreeBuilder.java      |   3 +-
 .../builders/TermRangeQueryNodeBuilder.java     |   3 +-
 .../builders/WildcardQueryNodeBuilder.java      |   3 +-
 .../config/FieldBoostMapFCListener.java         |   3 +-
 .../config/FieldDateResolutionFCListener.java   |   3 +-
 .../flexible/standard/config/FuzzyConfig.java   |   3 +-
 .../standard/config/NumberDateFormat.java       |   3 +-
 .../flexible/standard/config/NumericConfig.java |   3 +-
 .../config/NumericFieldConfigListener.java      |   3 +-
 .../config/StandardQueryConfigHandler.java      |   3 +-
 .../standard/nodes/AbstractRangeQueryNode.java  |   3 +-
 .../standard/nodes/BooleanModifierNode.java     |   3 +-
 .../standard/nodes/MultiPhraseQueryNode.java    |   3 +-
 .../standard/nodes/NumericQueryNode.java        |   3 +-
 .../standard/nodes/NumericRangeQueryNode.java   |  27 +-
 .../standard/nodes/PrefixWildcardQueryNode.java |   7 +-
 .../standard/nodes/RegexpQueryNode.java         |   3 +-
 .../nodes/StandardBooleanQueryNode.java         |   3 +-
 .../standard/nodes/TermRangeQueryNode.java      |   3 +-
 .../standard/nodes/WildcardQueryNode.java       |   3 +-
 .../standard/parser/EscapeQuerySyntaxImpl.java  |   3 +-
 .../standard/parser/FastCharStream.java         |   5 +-
 .../AllowLeadingWildcardProcessor.java          |   3 +-
 .../processors/AnalyzerQueryNodeProcessor.java  |   3 +-
 .../BooleanQuery2ModifierNodeProcessor.java     |   3 +-
 ...ngleChildOptimizationQueryNodeProcessor.java |   3 +-
 .../processors/BoostQueryNodeProcessor.java     |   3 +-
 .../DefaultPhraseSlopQueryNodeProcessor.java    |   3 +-
 .../processors/FuzzyQueryNodeProcessor.java     |   3 +-
 ...owercaseExpandedTermsQueryNodeProcessor.java |   3 +-
 .../MatchAllDocsQueryNodeProcessor.java         |   3 +-
 .../MultiFieldQueryNodeProcessor.java           |   3 +-
 .../MultiTermRewriteMethodProcessor.java        |   3 +-
 .../processors/NumericQueryNodeProcessor.java   |   3 +-
 .../NumericRangeQueryNodeProcessor.java         |   3 +-
 .../processors/OpenRangeQueryNodeProcessor.java |   3 +-
 .../PhraseSlopQueryNodeProcessor.java           |   3 +-
 .../RemoveEmptyNonLeafQueryNodeProcessor.java   |   3 +-
 .../StandardQueryNodeProcessorPipeline.java     |   3 +-
 .../processors/TermRangeQueryNodeProcessor.java |   3 +-
 .../processors/WildcardQueryNodeProcessor.java  |   3 +-
 .../queryparser/simple/SimpleQueryParser.java   |   3 +-
 .../surround/parser/FastCharStream.java         |   3 +-
 .../queryparser/surround/query/AndQuery.java    |   4 +-
 .../surround/query/BasicQueryFactory.java       |   3 +-
 .../surround/query/ComposedQuery.java           |   3 +-
 .../surround/query/DistanceQuery.java           |   3 +-
 .../surround/query/DistanceRewriteQuery.java    |   3 +-
 .../surround/query/DistanceSubQuery.java        |   3 +-
 .../queryparser/surround/query/FieldsQuery.java |   3 +-
 .../queryparser/surround/query/NotQuery.java    |   3 +-
 .../queryparser/surround/query/OrQuery.java     |   3 +-
 .../surround/query/RewriteQuery.java            |   2 +-
 .../queryparser/surround/query/SimpleTerm.java  |   3 +-
 .../surround/query/SimpleTermRewriteQuery.java  |   2 +-
 .../surround/query/SpanNearClauseFactory.java   |   3 +-
 .../surround/query/SrndBooleanQuery.java        |   3 +-
 .../surround/query/SrndPrefixQuery.java         |   3 +-
 .../queryparser/surround/query/SrndQuery.java   |   3 +-
 .../surround/query/SrndTermQuery.java           |   3 +-
 .../surround/query/SrndTruncQuery.java          |   3 +-
 .../surround/query/TooManyBasicQueries.java     |   3 +-
 .../lucene/queryparser/xml/CoreParser.java      |  27 +-
 .../xml/CorePlusExtensionsParser.java           |  11 +-
 .../queryparser/xml/CorePlusQueriesParser.java  |  13 +-
 .../apache/lucene/queryparser/xml/DOMUtils.java |  19 +-
 .../lucene/queryparser/xml/ParserException.java |   5 +-
 .../lucene/queryparser/xml/QueryBuilder.java    |   8 +-
 .../queryparser/xml/QueryBuilderFactory.java    |  15 +-
 .../queryparser/xml/QueryTemplateManager.java   |  33 +-
 .../xml/builders/BooleanQueryBuilder.java       |  27 +-
 .../xml/builders/BoostingQueryBuilder.java      |  17 +-
 .../xml/builders/BoostingTermBuilder.java       |  23 +-
 .../xml/builders/ConstantScoreQueryBuilder.java |  19 +-
 .../builders/DisjunctionMaxQueryBuilder.java    |   3 +-
 .../xml/builders/FuzzyLikeThisQueryBuilder.java |  25 +-
 .../LegacyNumericRangeQueryBuilder.java         |   3 +-
 .../xml/builders/LikeThisQueryBuilder.java      |  31 +-
 .../xml/builders/MatchAllDocsQueryBuilder.java  |  13 +-
 .../xml/builders/RangeQueryBuilder.java         |   6 +-
 .../xml/builders/SpanBuilderBase.java           |  11 +-
 .../xml/builders/SpanFirstBuilder.java          |  15 +-
 .../xml/builders/SpanNearBuilder.java           |  23 +-
 .../xml/builders/SpanNotBuilder.java            |  15 +-
 .../queryparser/xml/builders/SpanOrBuilder.java |  23 +-
 .../xml/builders/SpanOrTermsBuilder.java        |  33 +-
 .../xml/builders/SpanQueryBuilder.java          |   3 +-
 .../xml/builders/SpanQueryBuilderFactory.java   |  17 +-
 .../xml/builders/SpanTermBuilder.java           |  17 +-
 .../xml/builders/TermQueryBuilder.java          |  19 +-
 .../xml/builders/TermsQueryBuilder.java         |  33 +-
 .../xml/builders/UserInputQueryBuilder.java     |  23 +-
 .../analyzing/TestAnalyzingQueryParser.java     |   3 +-
 .../queryparser/classic/TestMultiAnalyzer.java  |   3 +-
 .../classic/TestMultiFieldQueryParser.java      |   3 +-
 .../classic/TestMultiPhraseQueryParsing.java    |   3 +-
 .../queryparser/classic/TestQueryParser.java    |   3 +-
 .../complexPhrase/TestComplexPhraseQuery.java   |   3 +-
 .../lucene/queryparser/ext/ExtensionStub.java   |  13 +-
 .../ext/TestExtendableQueryParser.java          |   3 +-
 .../lucene/queryparser/ext/TestExtensions.java  |   3 +-
 .../core/builders/TestQueryTreeBuilder.java     |   3 +-
 .../flexible/core/nodes/TestQueryNode.java      |   3 +-
 .../flexible/messages/MessagesTestBundle.java   |  27 +-
 .../queryparser/flexible/messages/TestNLS.java  |   3 +-
 .../precedence/TestPrecedenceQueryParser.java   |   3 +-
 .../flexible/spans/SpanOrQueryNodeBuilder.java  |   3 +-
 .../spans/SpanTermQueryNodeBuilder.java         |   3 +-
 .../flexible/spans/SpansQueryConfigHandler.java |   3 +-
 .../flexible/spans/SpansQueryTreeBuilder.java   |   3 +-
 .../spans/SpansValidatorQueryNodeProcessor.java |   3 +-
 .../flexible/spans/TestSpanQueryParser.java     |   3 +-
 .../spans/TestSpanQueryParserSimpleSample.java  |   3 +-
 .../flexible/spans/UniqueFieldAttribute.java    |   3 +-
 .../spans/UniqueFieldAttributeImpl.java         |   3 +-
 .../spans/UniqueFieldQueryNodeProcessor.java    |   3 +-
 .../standard/TestMultiAnalyzerQPHelper.java     |   3 +-
 .../standard/TestMultiFieldQPHelper.java        |   3 +-
 .../standard/TestNumericQueryParser.java        |   3 +-
 .../flexible/standard/TestQPHelper.java         |   3 +-
 .../flexible/standard/TestStandardQP.java       |   3 +-
 .../simple/TestSimpleQueryParser.java           |   3 +-
 .../surround/query/BooleanQueryTst.java         |   3 +-
 .../surround/query/ExceptionQueryTst.java       |   3 +-
 .../surround/query/SingleFieldTestDb.java       |   3 +-
 .../surround/query/SrndQueryTest.java           |   3 +-
 .../surround/query/Test01Exceptions.java        |   3 +-
 .../surround/query/Test02Boolean.java           |   3 +-
 .../surround/query/Test03Distance.java          |   3 +-
 .../queryparser/util/QueryParserTestBase.java   |   3 +-
 .../lucene/queryparser/xml/TestCoreParser.java  |   9 +-
 .../xml/TestCorePlusExtensionsParser.java       |   9 +-
 .../xml/TestCorePlusQueriesParser.java          |   9 +-
 .../xml/TestQueryTemplateManager.java           |   3 +-
 .../builders/TestNumericRangeQueryBuilder.java  |   3 +-
 .../IndexAndTaxonomyReplicationHandler.java     |   3 +-
 .../replicator/IndexAndTaxonomyRevision.java    |   3 +-
 .../replicator/IndexInputInputStream.java       |   3 +-
 .../replicator/IndexReplicationHandler.java     |   3 +-
 .../apache/lucene/replicator/IndexRevision.java |   3 +-
 .../lucene/replicator/LocalReplicator.java      |   3 +-
 .../replicator/PerSessionDirectoryFactory.java  |   3 +-
 .../lucene/replicator/ReplicationClient.java    |   3 +-
 .../apache/lucene/replicator/Replicator.java    |   3 +-
 .../org/apache/lucene/replicator/Revision.java  |   3 +-
 .../apache/lucene/replicator/RevisionFile.java  |   3 +-
 .../replicator/SessionExpiredException.java     |   3 +-
 .../apache/lucene/replicator/SessionToken.java  |   3 +-
 .../lucene/replicator/http/HttpClientBase.java  |   3 +-
 .../lucene/replicator/http/HttpReplicator.java  |   3 +-
 .../replicator/http/ReplicationService.java     |   3 +-
 .../lucene/replicator/nrt/ReplicaNode.java      |   5 +
 .../IndexAndTaxonomyReplicationClientTest.java  |  20 +-
 .../IndexAndTaxonomyRevisionTest.java           |  11 +-
 .../replicator/IndexReplicationClientTest.java  |   3 +-
 .../lucene/replicator/IndexRevisionTest.java    |   7 +-
 .../lucene/replicator/LocalReplicatorTest.java  |  93 +-
 .../lucene/replicator/ReplicatorTestCase.java   |   3 +-
 .../lucene/replicator/SessionTokenTest.java     |   3 +-
 .../replicator/http/HttpReplicatorTest.java     |   8 +-
 .../replicator/http/ReplicationServlet.java     |   3 +-
 .../replicator/nrt/TestNRTReplication.java      |   6 +-
 lucene/sandbox/build.xml                        |  25 +
 .../idversion/IDVersionPostingsFormat.java      |   3 +-
 .../idversion/IDVersionPostingsReader.java      |   3 +-
 .../idversion/IDVersionPostingsWriter.java      |   3 +-
 .../idversion/IDVersionSegmentTermsEnum.java    |   3 +-
 .../IDVersionSegmentTermsEnumFrame.java         |   3 +-
 .../codecs/idversion/IDVersionTermState.java    |   3 +-
 .../lucene/codecs/idversion/SingleDocsEnum.java |   3 +-
 .../codecs/idversion/SinglePostingsEnum.java    |   3 +-
 .../idversion/VersionBlockTreeTermsReader.java  |   3 +-
 .../idversion/VersionBlockTreeTermsWriter.java  |   3 +-
 .../codecs/idversion/VersionFieldReader.java    |   3 +-
 .../apache/lucene/document/GeoPointField.java   | 132 ---
 .../org/apache/lucene/document/LatLonPoint.java |   5 +-
 .../lucene/payloads/PayloadSpanCollector.java   |   3 +-
 .../apache/lucene/payloads/PayloadSpanUtil.java |   3 +-
 .../sandbox/queries/FuzzyLikeThisQuery.java     |   3 +-
 .../lucene/sandbox/queries/SlowFuzzyQuery.java  |   3 +-
 .../sandbox/queries/SlowFuzzyTermsEnum.java     |   3 +-
 .../lucene/search/DocValuesNumbersQuery.java    |   3 +-
 .../lucene/search/DocValuesRangeQuery.java      |   3 +-
 .../lucene/search/DocValuesTermsQuery.java      |   3 +-
 .../apache/lucene/search/GeoBoundingBox.java    |  47 -
 .../lucene/search/GeoPointDistanceQuery.java    | 171 ----
 .../search/GeoPointDistanceQueryImpl.java       | 132 ---
 .../search/GeoPointDistanceRangeQuery.java      | 103 --
 .../lucene/search/GeoPointInBBoxQuery.java      | 153 ---
 .../lucene/search/GeoPointInBBoxQueryImpl.java  | 163 ---
 .../lucene/search/GeoPointInPolygonQuery.java   | 195 ----
 .../apache/lucene/search/GeoPointTermQuery.java |  71 --
 .../GeoPointTermQueryConstantScoreWrapper.java  | 130 ---
 .../apache/lucene/search/GeoPointTermsEnum.java | 250 -----
 .../lucene/search/PointInPolygonQuery.java      |  11 +-
 .../apache/lucene/search/PointInRectQuery.java  |   5 +-
 .../lucene/search/TermAutomatonQuery.java       |   3 +-
 .../lucene/search/TermAutomatonScorer.java      |   3 +-
 .../search/TokenStreamToTermAutomatonQuery.java |   3 +-
 .../apache/lucene/util/GeoDistanceUtils.java    | 216 ----
 .../org/apache/lucene/util/GeoHashUtils.java    | 274 -----
 .../apache/lucene/util/GeoProjectionUtils.java  | 438 --------
 .../java/org/apache/lucene/util/GeoRect.java    |  67 --
 .../apache/lucene/util/GeoRelationUtils.java    | 428 --------
 .../java/org/apache/lucene/util/GeoUtils.java   | 238 -----
 .../java/org/apache/lucene/util/package.html    |  28 -
 .../codecs/idversion/StringAndPayloadField.java |   7 +-
 .../idversion/TestIDVersionPostingsFormat.java  |   3 +-
 .../lucene/payloads/TestPayloadSpanUtil.java    |   3 +-
 .../sandbox/queries/FuzzyLikeThisQueryTest.java |   3 +-
 .../sandbox/queries/TestSlowFuzzyQuery.java     |   3 +-
 .../sandbox/queries/TestSlowFuzzyQuery2.java    |   3 +-
 .../search/TestDocValuesNumbersQuery.java       |   3 +-
 .../lucene/search/TestDocValuesRangeQuery.java  |   3 +-
 .../lucene/search/TestDocValuesTermsQuery.java  |   3 +-
 .../search/TestFieldCacheTermsFilter.java       |   3 +-
 .../apache/lucene/search/TestGeoPointQuery.java | 351 -------
 .../lucene/search/TestLatLonPointQueries.java   |  61 +-
 .../lucene/search/TestTermAutomatonQuery.java   |   3 +-
 .../lucene/util/BaseGeoPointTestCase.java       | 782 ---------------
 .../org/apache/lucene/util/TestGeoUtils.java    | 537 ----------
 .../apache/lucene/spatial/SpatialStrategy.java  |   3 +-
 .../spatial/bbox/BBoxSimilarityValueSource.java |   3 +-
 .../lucene/spatial/bbox/BBoxStrategy.java       |   3 +-
 .../lucene/spatial/bbox/BBoxValueSource.java    |   3 +-
 .../composite/CompositeSpatialStrategy.java     |   3 +-
 .../spatial/composite/CompositeVerifyQuery.java |   3 +-
 .../composite/IntersectsRPTVerifyQuery.java     |   3 +-
 .../lucene/spatial/document/GeoPointField.java  | 250 +++++
 .../spatial/document/GeoPointTokenStream.java   | 233 +++++
 .../lucene/spatial/document/package-info.java   |  21 +
 .../spatial/prefix/AbstractPrefixTreeQuery.java |   3 +-
 .../prefix/AbstractVisitingPrefixTreeQuery.java |   3 +-
 .../prefix/BytesRefIteratorTokenStream.java     |   3 +-
 .../spatial/prefix/CellToBytesRefIterator.java  |   3 +-
 .../spatial/prefix/ContainsPrefixTreeQuery.java |   3 +-
 .../spatial/prefix/HeatmapFacetCounter.java     |   3 +-
 .../prefix/IntersectsPrefixTreeQuery.java       |   3 +-
 .../prefix/NumberRangePrefixTreeStrategy.java   |   3 +-
 .../PointPrefixTreeFieldCacheProvider.java      |   3 +-
 .../spatial/prefix/PrefixTreeFacetCounter.java  |   3 +-
 .../spatial/prefix/PrefixTreeStrategy.java      |   3 +-
 .../prefix/RecursivePrefixTreeStrategy.java     |   3 +-
 .../prefix/TermQueryPrefixTreeStrategy.java     |   3 +-
 .../spatial/prefix/WithinPrefixTreeQuery.java   |   3 +-
 .../apache/lucene/spatial/prefix/tree/Cell.java |   3 +-
 .../spatial/prefix/tree/CellIterator.java       |   3 +-
 .../prefix/tree/DateRangePrefixTree.java        |   3 +-
 .../spatial/prefix/tree/FilterCellIterator.java |   3 +-
 .../spatial/prefix/tree/GeohashPrefixTree.java  |   3 +-
 .../lucene/spatial/prefix/tree/LegacyCell.java  |   3 +-
 .../spatial/prefix/tree/LegacyPrefixTree.java   |   3 +-
 .../prefix/tree/NumberRangePrefixTree.java      |   3 +-
 .../prefix/tree/PackedQuadPrefixTree.java       |   3 +-
 .../spatial/prefix/tree/QuadPrefixTree.java     |   3 +-
 .../prefix/tree/SingletonCellIterator.java      |   3 +-
 .../spatial/prefix/tree/SpatialPrefixTree.java  |   3 +-
 .../prefix/tree/SpatialPrefixTreeFactory.java   |   1 -
 .../spatial/prefix/tree/TreeCellIterator.java   |   3 +-
 .../lucene/spatial/query/SpatialArgs.java       |   3 +-
 .../lucene/spatial/query/SpatialArgsParser.java |   3 +-
 .../lucene/spatial/query/SpatialOperation.java  |   3 +-
 .../query/UnsupportedSpatialOperation.java      |   3 +-
 .../lucene/spatial/search/GeoBoundingBox.java   |  53 +
 .../spatial/search/GeoPointDistanceQuery.java   | 189 ++++
 .../search/GeoPointDistanceQueryImpl.java       | 107 ++
 .../search/GeoPointDistanceRangeQuery.java      | 116 +++
 .../spatial/search/GeoPointInBBoxQuery.java     | 173 ++++
 .../spatial/search/GeoPointInBBoxQueryImpl.java | 156 +++
 .../spatial/search/GeoPointInPolygonQuery.java  | 153 +++
 .../search/GeoPointInPolygonQueryImpl.java      | 103 ++
 .../spatial/search/GeoPointMultiTermQuery.java  | 166 ++++
 .../search/GeoPointNumericTermsEnum.java        | 161 +++
 .../spatial/search/GeoPointPrefixTermsEnum.java | 237 +++++
 .../GeoPointTermQueryConstantScoreWrapper.java  | 141 +++
 .../spatial/search/GeoPointTermsEnum.java       | 140 +++
 .../lucene/spatial/search/package-info.java     |  21 +
 .../serialized/SerializedDVStrategy.java        |   3 +-
 .../lucene/spatial/spatial4j/Geo3dShape.java    |   3 +-
 .../spatial/util/CachingDoubleValueSource.java  |   1 -
 .../util/DistanceToShapeValueSource.java        |   3 +-
 .../lucene/spatial/util/GeoDistanceUtils.java   | 223 +++++
 .../lucene/spatial/util/GeoEncodingUtils.java   | 157 +++
 .../lucene/spatial/util/GeoHashUtils.java       | 283 ++++++
 .../lucene/spatial/util/GeoProjectionUtils.java | 465 +++++++++
 .../org/apache/lucene/spatial/util/GeoRect.java |  66 ++
 .../lucene/spatial/util/GeoRelationUtils.java   | 520 ++++++++++
 .../apache/lucene/spatial/util/GeoUtils.java    | 187 ++++
 .../spatial/util/ShapeAreaValueSource.java      |   3 +-
 .../lucene/spatial/util/ShapeFieldCache.java    |   1 -
 .../ShapeFieldCacheDistanceValueSource.java     |   3 +-
 .../spatial/util/ShapeFieldCacheProvider.java   |   1 -
 .../spatial/util/ShapePredicateValueSource.java |   3 +-
 .../spatial/vector/DistanceValueSource.java     |   3 +-
 .../spatial/vector/PointVectorStrategy.java     |   3 +-
 .../lucene/spatial/DistanceStrategyTest.java    |   3 +-
 .../apache/lucene/spatial/PortedSolr3Test.java  |   3 +-
 .../lucene/spatial/QueryEqualsHashCodeTest.java |   3 +-
 .../apache/lucene/spatial/SpatialArgsTest.java  |   3 +-
 .../apache/lucene/spatial/SpatialExample.java   |   3 +-
 .../lucene/spatial/SpatialMatchConcern.java     |   1 -
 .../apache/lucene/spatial/SpatialTestCase.java  |   3 +-
 .../apache/lucene/spatial/SpatialTestData.java  |   3 +-
 .../apache/lucene/spatial/SpatialTestQuery.java |   3 +-
 .../apache/lucene/spatial/StrategyTestCase.java |   5 +-
 .../lucene/spatial/TestTestFramework.java       |   3 +-
 .../lucene/spatial/bbox/TestBBoxStrategy.java   |   3 +-
 .../composite/CompositeStrategyTest.java        |   3 +-
 .../prefix/CellToBytesRefIterator50.java        |   3 +-
 .../spatial/prefix/DateNRStrategyTest.java      |   3 +-
 .../spatial/prefix/HeatmapFacetCounterTest.java |   3 +-
 .../lucene/spatial/prefix/JtsPolygonTest.java   |   3 +-
 .../spatial/prefix/NumberRangeFacetsTest.java   |   3 +-
 .../RandomSpatialOpFuzzyPrefixTree50Test.java   |   3 +-
 .../RandomSpatialOpFuzzyPrefixTreeTest.java     |   3 +-
 .../prefix/RandomSpatialOpStrategyTestCase.java |   3 +-
 .../prefix/TestRecursivePrefixTreeStrategy.java |   3 +-
 .../prefix/TestTermQueryPrefixGridStrategy.java |   3 +-
 .../prefix/tree/DateRangePrefixTreeTest.java    |   3 +-
 .../prefix/tree/SpatialPrefixTreeTest.java      |   3 +-
 .../spatial/query/SpatialArgsParserTest.java    |   3 +-
 .../spatial/search/TestGeoPointQuery.java       | 404 ++++++++
 .../serialized/SerializedStrategyTest.java      |   3 +-
 .../lucene/spatial/spatial4j/Geo3dRptTest.java  |   3 +-
 .../Geo3dShapeRectRelationTestCase.java         |   3 +-
 .../Geo3dShapeSphereModelRectRelationTest.java  |   3 +-
 .../Geo3dShapeWGS84ModelRectRelationTest.java   |   3 +-
 .../spatial4j/RandomizedShapeTestCase.java      |   4 +-
 .../spatial/spatial4j/geo3d/GeoPointTest.java   |   3 +-
 .../spatial/util/BaseGeoPointTestCase.java      | 760 ++++++++++++++
 .../lucene/spatial/util/TestGeoUtils.java       | 565 +++++++++++
 .../spatial/vector/TestPointVectorStrategy.java |   3 +-
 .../org/apache/lucene/geo3d/ArcDistance.java    |   3 +-
 .../apache/lucene/geo3d/BasePlanetObject.java   |   3 +-
 .../org/apache/lucene/geo3d/BaseXYZSolid.java   |   3 +-
 .../java/org/apache/lucene/geo3d/Bounds.java    |   3 +-
 .../org/apache/lucene/geo3d/DistanceStyle.java  |   3 +-
 .../org/apache/lucene/geo3d/Geo3DPoint.java     |   3 +-
 .../java/org/apache/lucene/geo3d/Geo3DUtil.java |   3 +-
 .../java/org/apache/lucene/geo3d/GeoArea.java   |   3 +-
 .../org/apache/lucene/geo3d/GeoAreaFactory.java |   3 +-
 .../java/org/apache/lucene/geo3d/GeoBBox.java   |   3 +-
 .../org/apache/lucene/geo3d/GeoBBoxFactory.java |   3 +-
 .../org/apache/lucene/geo3d/GeoBaseBBox.java    |   3 +-
 .../org/apache/lucene/geo3d/GeoBaseCircle.java  |   3 +-
 .../lucene/geo3d/GeoBaseDistanceShape.java      |   3 +-
 .../lucene/geo3d/GeoBaseMembershipShape.java    |   3 +-
 .../org/apache/lucene/geo3d/GeoBasePolygon.java |   3 +-
 .../org/apache/lucene/geo3d/GeoBaseShape.java   |   3 +-
 .../java/org/apache/lucene/geo3d/GeoCircle.java |   3 +-
 .../apache/lucene/geo3d/GeoCircleFactory.java   |   3 +-
 .../geo3d/GeoCompositeMembershipShape.java      |   3 +-
 .../lucene/geo3d/GeoCompositePolygon.java       |   3 +-
 .../apache/lucene/geo3d/GeoConvexPolygon.java   |   3 +-
 .../geo3d/GeoDegenerateHorizontalLine.java      |   3 +-
 .../lucene/geo3d/GeoDegenerateLatitudeZone.java |   3 +-
 .../geo3d/GeoDegenerateLongitudeSlice.java      |   3 +-
 .../apache/lucene/geo3d/GeoDegeneratePoint.java |   5 +-
 .../lucene/geo3d/GeoDegenerateVerticalLine.java |   3 +-
 .../org/apache/lucene/geo3d/GeoDistance.java    |   3 +-
 .../apache/lucene/geo3d/GeoDistanceShape.java   |   3 +-
 .../apache/lucene/geo3d/GeoLatitudeZone.java    |   3 +-
 .../apache/lucene/geo3d/GeoLongitudeSlice.java  |   3 +-
 .../apache/lucene/geo3d/GeoMembershipShape.java |   3 +-
 .../lucene/geo3d/GeoNorthLatitudeZone.java      |   3 +-
 .../apache/lucene/geo3d/GeoNorthRectangle.java  |   3 +-
 .../apache/lucene/geo3d/GeoOutsideDistance.java |   3 +-
 .../java/org/apache/lucene/geo3d/GeoPath.java   |   3 +-
 .../java/org/apache/lucene/geo3d/GeoPoint.java  |   5 +-
 .../org/apache/lucene/geo3d/GeoPolygon.java     |   3 +-
 .../apache/lucene/geo3d/GeoPolygonFactory.java  |   3 +-
 .../org/apache/lucene/geo3d/GeoRectangle.java   |   3 +-
 .../java/org/apache/lucene/geo3d/GeoShape.java  |   3 +-
 .../org/apache/lucene/geo3d/GeoSizeable.java    |   3 +-
 .../lucene/geo3d/GeoSouthLatitudeZone.java      |   3 +-
 .../apache/lucene/geo3d/GeoSouthRectangle.java  |   3 +-
 .../apache/lucene/geo3d/GeoStandardCircle.java  |   3 +-
 .../geo3d/GeoWideDegenerateHorizontalLine.java  |   3 +-
 .../lucene/geo3d/GeoWideLongitudeSlice.java     |   3 +-
 .../lucene/geo3d/GeoWideNorthRectangle.java     |   3 +-
 .../apache/lucene/geo3d/GeoWideRectangle.java   |   3 +-
 .../lucene/geo3d/GeoWideSouthRectangle.java     |   3 +-
 .../java/org/apache/lucene/geo3d/GeoWorld.java  |   3 +-
 .../org/apache/lucene/geo3d/LatLonBounds.java   |   3 +-
 .../org/apache/lucene/geo3d/LinearDistance.java |   3 +-
 .../lucene/geo3d/LinearSquaredDistance.java     |   3 +-
 .../org/apache/lucene/geo3d/Membership.java     |   3 +-
 .../org/apache/lucene/geo3d/NormalDistance.java |   3 +-
 .../lucene/geo3d/NormalSquaredDistance.java     |   3 +-
 .../src/java/org/apache/lucene/geo3d/Plane.java |   3 +-
 .../org/apache/lucene/geo3d/PlanetModel.java    |   3 +-
 .../lucene/geo3d/PointInGeo3DShapeQuery.java    |   3 +-
 .../org/apache/lucene/geo3d/SidedPlane.java     |   3 +-
 .../apache/lucene/geo3d/StandardXYZSolid.java   |   3 +-
 .../src/java/org/apache/lucene/geo3d/Tools.java |   3 +-
 .../java/org/apache/lucene/geo3d/Vector.java    |   3 +-
 .../java/org/apache/lucene/geo3d/XYZBounds.java |   3 +-
 .../java/org/apache/lucene/geo3d/XYZSolid.java  |   3 +-
 .../apache/lucene/geo3d/XYZSolidFactory.java    |   3 +-
 .../java/org/apache/lucene/geo3d/XYdZSolid.java |   3 +-
 .../java/org/apache/lucene/geo3d/XdYZSolid.java |   3 +-
 .../org/apache/lucene/geo3d/XdYdZSolid.java     |   3 +-
 .../java/org/apache/lucene/geo3d/dXYZSolid.java |   3 +-
 .../org/apache/lucene/geo3d/dXYdZSolid.java     |   3 +-
 .../org/apache/lucene/geo3d/dXdYZSolid.java     |   3 +-
 .../org/apache/lucene/geo3d/dXdYdZSolid.java    |   3 +-
 .../org/apache/lucene/geo3d/GeoBBoxTest.java    |   3 +-
 .../org/apache/lucene/geo3d/GeoCircleTest.java  |   3 +-
 .../lucene/geo3d/GeoConvexPolygonTest.java      |   3 +-
 .../org/apache/lucene/geo3d/GeoModelTest.java   |   3 +-
 .../org/apache/lucene/geo3d/GeoPathTest.java    |   3 +-
 .../org/apache/lucene/geo3d/GeoPolygonTest.java |   3 +-
 .../test/org/apache/lucene/geo3d/PlaneTest.java |   3 +-
 .../org/apache/lucene/geo3d/TestGeo3DPoint.java |  14 +-
 .../org/apache/lucene/geo3d/XYZSolidTest.java   |   3 +-
 .../lucene/search/spell/CombineSuggestion.java  |   3 +-
 .../apache/lucene/search/spell/Dictionary.java  |   3 +-
 .../lucene/search/spell/DirectSpellChecker.java |   3 +-
 .../search/spell/HighFrequencyDictionary.java   |   1 -
 .../search/spell/JaroWinklerDistance.java       |   3 +-
 .../lucene/search/spell/LevensteinDistance.java |   3 +-
 .../lucene/search/spell/LuceneDictionary.java   |   3 +-
 .../search/spell/LuceneLevenshteinDistance.java |   3 +-
 .../lucene/search/spell/NGramDistance.java      |  33 +-
 .../search/spell/PlainTextDictionary.java       |   3 +-
 .../lucene/search/spell/SpellChecker.java       |   3 +-
 .../lucene/search/spell/StringDistance.java     |   3 +-
 .../apache/lucene/search/spell/SuggestMode.java |   3 +-
 .../apache/lucene/search/spell/SuggestWord.java |   5 +-
 .../spell/SuggestWordFrequencyComparator.java   |   6 +-
 .../lucene/search/spell/SuggestWordQueue.java   |   5 +-
 .../spell/SuggestWordScoreComparator.java       |   3 +-
 .../search/spell/WordBreakSpellChecker.java     |   3 +-
 .../lucene/search/suggest/BitsProducer.java     |   3 +-
 .../search/suggest/BufferedInputIterator.java   |   3 +-
 .../search/suggest/DocumentDictionary.java      |   3 +-
 .../suggest/DocumentValueSourceDictionary.java  |   3 +-
 .../lucene/search/suggest/FileDictionary.java   |   4 +-
 .../lucene/search/suggest/InMemorySorter.java   |   3 +-
 .../lucene/search/suggest/InputIterator.java    |   3 +-
 .../apache/lucene/search/suggest/Lookup.java    |   3 +-
 .../search/suggest/SortedInputIterator.java     |   3 +-
 .../search/suggest/UnsortedInputIterator.java   |   3 +-
 .../analyzing/AnalyzingInfixSuggester.java      |   6 +-
 .../suggest/analyzing/AnalyzingSuggester.java   |   3 +-
 .../analyzing/BlendedInfixSuggester.java        |   3 +-
 .../search/suggest/analyzing/FSTUtil.java       |   3 +-
 .../suggest/analyzing/FreeTextSuggester.java    |   3 +-
 .../suggest/analyzing/FuzzySuggester.java       |   3 +-
 .../suggest/analyzing/SuggestStopFilter.java    |   3 +-
 .../analyzing/SuggestStopFilterFactory.java     |   3 +-
 .../document/Completion50PostingsFormat.java    |   4 +-
 .../suggest/document/CompletionAnalyzer.java    |   3 +-
 .../document/CompletionFieldsConsumer.java      |   3 +-
 .../document/CompletionFieldsProducer.java      |   3 +-
 .../document/CompletionPostingsFormat.java      |   3 +-
 .../suggest/document/CompletionQuery.java       |   3 +-
 .../suggest/document/CompletionScorer.java      |   3 +-
 .../suggest/document/CompletionTerms.java       |   3 +-
 .../suggest/document/CompletionTokenStream.java |   3 +-
 .../suggest/document/CompletionWeight.java      |   3 +-
 .../document/CompletionsTermsReader.java        |   3 +-
 .../search/suggest/document/ContextQuery.java   |   3 +-
 .../suggest/document/ContextSuggestField.java   |   3 +-
 .../suggest/document/FuzzyCompletionQuery.java  |   3 +-
 .../search/suggest/document/NRTSuggester.java   |   3 +-
 .../suggest/document/NRTSuggesterBuilder.java   |   3 +-
 .../suggest/document/PrefixCompletionQuery.java |   3 +-
 .../suggest/document/RegexCompletionQuery.java  |   3 +-
 .../search/suggest/document/SuggestField.java   |   9 +-
 .../suggest/document/SuggestIndexSearcher.java  |   3 +-
 .../document/SuggestScoreDocPriorityQueue.java  |   3 +-
 .../search/suggest/document/TopSuggestDocs.java |   3 +-
 .../document/TopSuggestDocsCollector.java       |   3 +-
 .../search/suggest/fst/BytesRefSorter.java      |   3 +-
 .../search/suggest/fst/ExternalRefSorter.java   |   4 +-
 .../search/suggest/fst/FSTCompletion.java       |   3 +-
 .../suggest/fst/FSTCompletionBuilder.java       |   3 +-
 .../search/suggest/fst/FSTCompletionLookup.java |   3 +-
 .../suggest/fst/WFSTCompletionLookup.java       |   3 +-
 .../search/suggest/jaspell/JaspellLookup.java   |   3 +-
 .../jaspell/JaspellTernarySearchTrie.java       |   3 +-
 .../search/suggest/tst/TSTAutocomplete.java     |   3 +-
 .../lucene/search/suggest/tst/TSTLookup.java    |   3 +-
 .../search/suggest/tst/TernaryTreeNode.java     |   7 +-
 .../search/spell/TestDirectSpellChecker.java    |   3 +-
 .../search/spell/TestJaroWinklerDistance.java   |   3 +-
 .../search/spell/TestLevenshteinDistance.java   |   3 +-
 .../search/spell/TestLuceneDictionary.java      |   3 +-
 .../lucene/search/spell/TestNGramDistance.java  |   3 +-
 .../search/spell/TestPlainTextDictionary.java   |   3 +-
 .../lucene/search/spell/TestSpellChecker.java   |   3 +-
 .../search/spell/TestWordBreakSpellChecker.java |   3 +-
 .../apache/lucene/search/suggest/Average.java   |   5 +-
 .../search/suggest/DocumentDictionaryTest.java  |  33 +-
 .../DocumentValueSourceDictionaryTest.java      |   3 +-
 .../search/suggest/FileDictionaryTest.java      |  33 +-
 .../org/apache/lucene/search/suggest/Input.java |   3 +-
 .../search/suggest/InputArrayIterator.java      |   3 +-
 .../search/suggest/LookupBenchmarkTest.java     |   3 +-
 .../lucene/search/suggest/PersistenceTest.java  |   6 +-
 .../suggest/TestHighFrequencyDictionary.java    |  27 +-
 .../search/suggest/TestInputIterator.java       |  33 +-
 .../analyzing/AnalyzingInfixSuggesterTest.java  |   3 +-
 .../analyzing/AnalyzingSuggesterTest.java       |   9 +-
 .../analyzing/BlendedInfixSuggesterTest.java    |   3 +-
 .../suggest/analyzing/FuzzySuggesterTest.java   |   9 +-
 .../analyzing/TestFreeTextSuggester.java        |   3 +-
 .../analyzing/TestSuggestStopFilter.java        |   3 +-
 .../analyzing/TestSuggestStopFilterFactory.java |   3 +-
 .../document/CompletionTokenStreamTest.java     |   3 +-
 .../suggest/document/TestContextQuery.java      |   3 +-
 .../document/TestContextSuggestField.java       |   3 +-
 .../document/TestFuzzyCompletionQuery.java      |   3 +-
 .../document/TestPrefixCompletionQuery.java     |   3 +-
 .../document/TestRegexCompletionQuery.java      |   3 +-
 .../suggest/document/TestSuggestField.java      |   3 +-
 .../search/suggest/fst/BytesRefSortersTest.java |   6 +-
 .../search/suggest/fst/FSTCompletionTest.java   |   9 +-
 .../search/suggest/fst/WFSTCompletionTest.java  |   9 +-
 .../analysis/BaseTokenStreamTestCase.java       |   3 +-
 .../analysis/CannedBinaryTokenStream.java       |   3 +-
 .../lucene/analysis/CannedTokenStream.java      |   3 +-
 .../lucene/analysis/CollationTestBase.java      |   4 +-
 .../lucene/analysis/CrankyTokenFilter.java      |   3 +-
 .../lucene/analysis/LookaheadTokenFilter.java   |   3 +-
 .../apache/lucene/analysis/MockAnalyzer.java    |   3 +-
 .../lucene/analysis/MockBytesAnalyzer.java      |   3 +-
 .../apache/lucene/analysis/MockCharFilter.java  |   3 +-
 .../analysis/MockFixedLengthPayloadFilter.java  |   3 +-
 .../lucene/analysis/MockGraphTokenFilter.java   |   3 +-
 .../analysis/MockHoleInjectingTokenFilter.java  |   4 +-
 .../lucene/analysis/MockPayloadAnalyzer.java    |   4 +-
 .../MockRandomLookaheadTokenFilter.java         |   3 +-
 .../lucene/analysis/MockReaderWrapper.java      |   3 +-
 .../apache/lucene/analysis/MockTokenFilter.java |   3 +-
 .../apache/lucene/analysis/MockTokenizer.java   |   3 +-
 .../analysis/MockUTF16TermAttributeImpl.java    |   3 +-
 .../MockVariableLengthPayloadFilter.java        |   3 +-
 .../lucene/analysis/SimplePayloadFilter.java    |   3 +-
 .../lucene/analysis/TokenStreamToDot.java       |   3 +-
 .../lucene/analysis/ValidatingTokenFilter.java  |   3 +-
 .../lucene/analysis/VocabularyAssert.java       |   5 +-
 .../lucene/codecs/MissingOrdRemapper.java       |  11 +-
 .../lucene/codecs/asserting/AssertingCodec.java |   3 +-
 .../asserting/AssertingDocValuesFormat.java     |   3 +-
 .../asserting/AssertingLiveDocsFormat.java      |   3 +-
 .../codecs/asserting/AssertingNormsFormat.java  |   3 +-
 .../codecs/asserting/AssertingPointFormat.java  |   8 +-
 .../asserting/AssertingPostingsFormat.java      |   3 +-
 .../asserting/AssertingStoredFieldsFormat.java  |   3 +-
 .../asserting/AssertingTermVectorsFormat.java   |   3 +-
 .../codecs/blockterms/LuceneFixedGap.java       |   3 +-
 .../blockterms/LuceneVarGapDocFreqInterval.java |   3 +-
 .../blockterms/LuceneVarGapFixedInterval.java   |   3 +-
 .../bloom/TestBloomFilteredLucenePostings.java  |   3 +-
 .../codecs/cheapbastard/CheapBastardCodec.java  |   3 +-
 .../codecs/compressing/CompressingCodec.java    |   3 +-
 .../compressing/FastCompressingCodec.java       |   3 +-
 .../FastDecompressionCompressingCodec.java      |   3 +-
 .../HighCompressionCompressingCodec.java        |   3 +-
 .../dummy/DummyCompressingCodec.java            |   3 +-
 .../lucene/codecs/cranky/CrankyCodec.java       |   9 +-
 .../codecs/cranky/CrankyCompoundFormat.java     |   3 +-
 .../codecs/cranky/CrankyDocValuesFormat.java    |   3 +-
 .../codecs/cranky/CrankyFieldInfosFormat.java   |   3 +-
 .../codecs/cranky/CrankyLiveDocsFormat.java     |   3 +-
 .../lucene/codecs/cranky/CrankyNormsFormat.java |   3 +-
 .../lucene/codecs/cranky/CrankyPointFormat.java | 175 ++++
 .../codecs/cranky/CrankyPostingsFormat.java     |   3 +-
 .../codecs/cranky/CrankySegmentInfoFormat.java  |   3 +-
 .../codecs/cranky/CrankyStoredFieldsFormat.java |   3 +-
 .../codecs/cranky/CrankyTermVectorsFormat.java  |   3 +-
 .../mockrandom/MockRandomPostingsFormat.java    |   3 +-
 .../codecs/ramonly/RAMOnlyPostingsFormat.java   |   3 +-
 .../lucene/index/AlcoholicMergePolicy.java      |   3 +-
 .../lucene/index/AllDeletedFilterReader.java    |   7 +-
 .../lucene/index/AssertingDirectoryReader.java  |   3 +-
 .../lucene/index/AssertingLeafReader.java       |  21 +-
 .../index/BaseCompoundFormatTestCase.java       |   8 +-
 .../BaseCompressingDocValuesFormatTestCase.java |   3 +-
 .../index/BaseDocValuesFormatTestCase.java      |   3 +-
 .../index/BaseFieldInfoFormatTestCase.java      |   3 +-
 .../index/BaseIndexFileFormatTestCase.java      |  19 +-
 .../lucene/index/BaseMergePolicyTestCase.java   |   3 +-
 .../lucene/index/BaseNormsFormatTestCase.java   |   3 +-
 .../lucene/index/BasePointFormatTestCase.java   | 917 +++++++++++++++++
 .../index/BasePostingsFormatTestCase.java       |   5 +-
 .../index/BaseSegmentInfoFormatTestCase.java    |   3 +-
 .../index/BaseStoredFieldsFormatTestCase.java   |   3 +-
 .../index/BaseTermVectorsFormatTestCase.java    |   3 +-
 .../apache/lucene/index/BaseTestCheckIndex.java |   4 +-
 .../java/org/apache/lucene/index/DocHelper.java |   3 +-
 .../lucene/index/FieldFilterLeafReader.java     |   3 +-
 .../apache/lucene/index/ForceMergePolicy.java   |  48 +-
 .../lucene/index/IndexWriterMaxDocsChanger.java |   7 +-
 .../lucene/index/MismatchedDirectoryReader.java |   3 +-
 .../lucene/index/MismatchedLeafReader.java      |   3 +-
 .../lucene/index/MockRandomMergePolicy.java     |   3 +-
 .../apache/lucene/index/PerThreadPKLookup.java  |   3 +-
 .../org/apache/lucene/index/RandomCodec.java    |   3 +-
 .../apache/lucene/index/RandomIndexWriter.java  |   3 +-
 .../lucene/index/RandomPostingsTester.java      |   4 +-
 .../SuppressingConcurrentMergeScheduler.java    |   7 +-
 .../ThreadedIndexingAndSearchingTestCase.java   |   4 +-
 .../apache/lucene/mockfile/DisableFsyncFS.java  |  23 +-
 .../org/apache/lucene/mockfile/ExtrasFS.java    |   3 +-
 .../mockfile/FilterAsynchronousFileChannel.java |   3 +-
 .../lucene/mockfile/FilterDirectoryStream.java  |   3 +-
 .../lucene/mockfile/FilterFileChannel.java      |   3 +-
 .../apache/lucene/mockfile/FilterFileStore.java |   3 +-
 .../lucene/mockfile/FilterFileSystem.java       |   3 +-
 .../mockfile/FilterFileSystemProvider.java      |   3 +-
 .../lucene/mockfile/FilterInputStream2.java     |   3 +-
 .../lucene/mockfile/FilterOutputStream2.java    |   3 +-
 .../org/apache/lucene/mockfile/FilterPath.java  |   3 +-
 .../mockfile/FilterSeekableByteChannel.java     |   3 +-
 .../apache/lucene/mockfile/HandleLimitFS.java   |   3 +-
 .../lucene/mockfile/HandleTrackingFS.java       |   3 +-
 .../java/org/apache/lucene/mockfile/LeakFS.java |   3 +-
 .../lucene/mockfile/MockFileSystemTestCase.java |   3 +-
 .../org/apache/lucene/mockfile/ShuffleFS.java   |   3 +-
 .../org/apache/lucene/mockfile/VerboseFS.java   |   3 +-
 .../apache/lucene/mockfile/VirusCheckingFS.java |  80 ++
 .../org/apache/lucene/mockfile/WindowsFS.java   |   3 +-
 .../lucene/search/AssertingBulkScorer.java      |   3 +-
 .../lucene/search/AssertingCollector.java       |   3 +-
 .../lucene/search/AssertingIndexSearcher.java   |   3 +-
 .../lucene/search/AssertingLeafCollector.java   |   3 +-
 .../apache/lucene/search/AssertingQuery.java    |   3 +-
 .../apache/lucene/search/AssertingScorer.java   |   3 +-
 .../apache/lucene/search/AssertingWeight.java   |   3 +-
 .../lucene/search/BaseExplanationTestCase.java  |   3 +-
 .../lucene/search/BulkScorerWrapperScorer.java  |   3 +-
 .../org/apache/lucene/search/CheckHits.java     |   3 +-
 .../org/apache/lucene/search/QueryUtils.java    |   3 +-
 .../lucene/search/RandomApproximationQuery.java |   3 +-
 .../lucene/search/ScorerIndexSearcher.java      |   3 +-
 .../search/SearchEquivalenceTestBase.java       |   3 +-
 .../lucene/search/ShardSearchingTestBase.java   |   3 +-
 .../search/similarities/RandomSimilarity.java   |   3 +-
 .../lucene/search/spans/AssertingSpanQuery.java |   3 +-
 .../search/spans/AssertingSpanWeight.java       |   3 +-
 .../lucene/search/spans/AssertingSpans.java     |   3 +-
 .../lucene/search/spans/MultiSpansWrapper.java  |   3 +-
 .../lucene/search/spans/SpanTestUtil.java       |   3 +-
 .../lucene/store/BaseDirectoryTestCase.java     |  77 +-
 .../lucene/store/BaseDirectoryWrapper.java      |   3 +-
 .../lucene/store/BaseLockFactoryTestCase.java   |  49 +-
 .../lucene/store/MockDirectoryWrapper.java      | 229 +----
 .../lucene/store/MockIndexInputWrapper.java     |  13 +-
 .../lucene/store/MockIndexOutputWrapper.java    |   3 +-
 .../lucene/store/RawDirectoryWrapper.java       |   3 +-
 .../store/SlowClosingMockIndexInputWrapper.java |   3 +-
 .../store/SlowOpeningMockIndexInputWrapper.java |   3 +-
 .../lucene/util/AbstractBeforeAfterRule.java    |  23 +-
 .../apache/lucene/util/BaseBitSetTestCase.java  |   3 +-
 .../lucene/util/BaseDocIdSetTestCase.java       |   3 +-
 .../apache/lucene/util/CloseableDirectory.java  |  15 +-
 .../java/org/apache/lucene/util/English.java    |   9 +-
 .../util/FailOnNonBulkMergesInfoStream.java     |   3 +-
 .../org/apache/lucene/util/FailureMarker.java   |  13 +-
 .../org/apache/lucene/util/LineFileDocs.java    |   3 +-
 .../lucene/util/LuceneJUnit3MethodProvider.java |   3 +-
 .../org/apache/lucene/util/LuceneTestCase.java  | 121 ++-
 .../org/apache/lucene/util/NullInfoStream.java  |   3 +-
 .../lucene/util/QuickPatchThreadsFilter.java    |   7 +-
 .../org/apache/lucene/util/RamUsageTester.java  |   3 +-
 .../org/apache/lucene/util/RemoveUponClose.java |  19 +-
 .../java/org/apache/lucene/util/Rethrow.java    |   3 +-
 .../util/RunListenerPrintReproduceInfo.java     |  33 +-
 .../lucene/util/TestRuleAssertionsRequired.java |   3 +-
 .../apache/lucene/util/TestRuleDelegate.java    |  15 +-
 .../util/TestRuleIgnoreAfterMaxFailures.java    |  21 +-
 .../lucene/util/TestRuleIgnoreTestSuites.java   |  11 +-
 .../lucene/util/TestRuleLimitSysouts.java       |  33 +-
 .../apache/lucene/util/TestRuleMarkFailure.java |  19 +-
 .../util/TestRuleRestoreSystemProperties.java   |  17 +-
 .../util/TestRuleSetupAndRestoreClassEnv.java   |   3 +-
 .../TestRuleSetupAndRestoreInstanceEnv.java     |   7 +-
 .../util/TestRuleSetupTeardownChained.java      |  13 +-
 .../lucene/util/TestRuleStoreClassName.java     |   3 +-
 .../util/TestRuleTemporaryFilesCleanup.java     |   5 +-
 .../lucene/util/TestRuleThreadAndTestName.java  |  11 +-
 .../apache/lucene/util/TestSecurityManager.java |   9 +-
 .../java/org/apache/lucene/util/TestUtil.java   | 105 +-
 .../lucene/util/ThrottledIndexOutput.java       |   9 +-
 .../java/org/apache/lucene/util/TimeUnits.java  |   3 +-
 .../util/automaton/AutomatonTestUtil.java       |   3 +-
 .../org/apache/lucene/util/fst/FSTTester.java   |   9 +-
 .../lucene/analysis/TestGraphTokenizers.java    |   3 +-
 .../analysis/TestLookaheadTokenFilter.java      |   3 +-
 .../lucene/analysis/TestMockAnalyzer.java       |   3 +-
 .../lucene/analysis/TestMockCharFilter.java     |   9 +-
 .../apache/lucene/analysis/TestPosition.java    |   5 +-
 .../lucene/analysis/TrivialLookaheadFilter.java |   3 +-
 .../asserting/TestAssertingDocValuesFormat.java |   3 +-
 .../asserting/TestAssertingNormsFormat.java     |   3 +-
 .../asserting/TestAssertingPointFormat.java     |  30 +
 .../asserting/TestAssertingPostingsFormat.java  |   3 +-
 .../TestAssertingStoredFieldsFormat.java        |   3 +-
 .../TestAssertingTermVectorsFormat.java         |   3 +-
 .../TestCompressingStoredFieldsFormat.java      |   7 +-
 .../TestCompressingTermVectorsFormat.java       |  33 +-
 .../lucene/index/TestAssertingLeafReader.java   |   3 +-
 .../lucene/index/TestForceMergePolicy.java      |   3 +-
 .../lucene/mockfile/TestDisableFsyncFS.java     |   3 +-
 .../apache/lucene/mockfile/TestExtrasFS.java    |   3 +-
 .../lucene/mockfile/TestHandleLimitFS.java      |   3 +-
 .../lucene/mockfile/TestHandleTrackingFS.java   |   3 +-
 .../org/apache/lucene/mockfile/TestLeakFS.java  |   3 +-
 .../apache/lucene/mockfile/TestShuffleFS.java   |   3 +-
 .../apache/lucene/mockfile/TestVerboseFS.java   |   3 +-
 .../lucene/mockfile/TestVirusCheckingFS.java    |  62 ++
 .../apache/lucene/mockfile/TestWindowsFS.java   |   5 +-
 .../lucene/store/TestMockDirectoryWrapper.java  |   4 +-
 .../test/org/apache/lucene/util/SorePoint.java  |   3 +-
 .../test/org/apache/lucene/util/SoreType.java   |   3 +-
 .../lucene/util/TestBeforeAfterOverrides.java   |  17 +-
 .../apache/lucene/util/TestCodecReported.java   |  15 +-
 .../util/TestExceptionInBeforeClassHooks.java   |   3 +-
 .../util/TestFailIfDirectoryNotClosed.java      |   3 +-
 .../util/TestFailIfUnreferencedFiles.java       |   3 +-
 .../apache/lucene/util/TestGroupFiltering.java  |  21 +-
 .../apache/lucene/util/TestJUnitRuleOrder.java  |   3 +-
 .../apache/lucene/util/TestMaxFailuresRule.java |   3 +-
 .../util/TestRamUsageTesterOnWildAnimals.java   |   3 +-
 .../lucene/util/TestReproduceMessage.java       |   3 +-
 .../util/TestReproduceMessageWithRepeated.java  |   3 +-
 .../util/TestRunWithRestrictedPermissions.java  |   3 +-
 .../lucene/util/TestSeedFromUncaught.java       |   3 +-
 .../lucene/util/TestSetupTeardownChaining.java  |   3 +-
 .../lucene/util/TestWorstCaseTestBehavior.java  |  15 +-
 .../org/apache/lucene/util/WithNestedTests.java |   3 +-
 .../dependencies/GetMavenDependenciesTask.java  |   3 +-
 .../dependencies/InterpolatedProperties.java    |   3 +-
 .../lucene/validation/LibVersionsCheckTask.java |   3 +-
 .../lucene/validation/LicenseCheckTask.java     |   3 +-
 .../apache/lucene/validation/LicenseType.java   |   5 +-
 .../lucene/validation/ivyde/IvyNodeElement.java |  28 +-
 .../validation/ivyde/IvyNodeElementAdapter.java |  28 +-
 solr/CHANGES.txt                                |  34 +
 .../apache/solr/schema/ICUCollationField.java   |   3 +-
 .../TestFoldingMultitermExtrasQuery.java        |   3 +-
 .../solr/schema/TestICUCollationField.java      |   1 -
 .../schema/TestICUCollationFieldDocValues.java  |   1 -
 .../schema/TestICUCollationFieldOptions.java    |   3 +-
 .../analytics/accumulator/BasicAccumulator.java |   1 -
 .../accumulator/FacetingAccumulator.java        |   1 -
 .../analytics/accumulator/ValueAccumulator.java |   1 -
 .../facet/FacetValueAccumulator.java            |   1 -
 .../facet/FieldFacetAccumulator.java            |   1 -
 .../facet/QueryFacetAccumulator.java            |   1 -
 .../facet/RangeFacetAccumulator.java            |   1 -
 .../analytics/expression/BaseExpression.java    |   1 -
 .../expression/DualDelegateExpression.java      |   1 -
 .../solr/analytics/expression/Expression.java   |   1 -
 .../analytics/expression/ExpressionFactory.java |   1 -
 .../expression/MultiDelegateExpression.java     |   1 -
 .../expression/SingleDelegateExpression.java    |   1 -
 .../plugin/AnalyticsStatisticsCollector.java    |   1 -
 .../request/AbstractFieldFacetRequest.java      |   1 -
 .../request/AnalyticsContentHandler.java        |   1 -
 .../analytics/request/AnalyticsRequest.java     |   1 -
 .../request/AnalyticsRequestFactory.java        |   1 -
 .../solr/analytics/request/AnalyticsStats.java  |   1 -
 .../analytics/request/ExpressionRequest.java    |   1 -
 .../solr/analytics/request/FacetRequest.java    |   1 -
 .../analytics/request/FieldFacetRequest.java    |   1 -
 .../analytics/request/QueryFacetRequest.java    |   1 -
 .../analytics/request/RangeFacetRequest.java    |   1 -
 .../AbstractDelegatingStatsCollector.java       |   1 -
 .../statistics/MedianStatsCollector.java        |   1 -
 .../statistics/MinMaxStatsCollector.java        |   1 -
 .../statistics/NumericStatsCollector.java       |   1 -
 .../statistics/PercentileStatsCollector.java    |   1 -
 .../analytics/statistics/StatsCollector.java    |   1 -
 .../StatsCollectorSupplierFactory.java          |   1 -
 .../statistics/UniqueStatsCollector.java        |   1 -
 .../solr/analytics/util/AnalyticsParams.java    |   1 -
 .../solr/analytics/util/AnalyticsParsers.java   |   1 -
 .../solr/analytics/util/MedianCalculator.java   |   1 -
 .../analytics/util/PercentileCalculator.java    |   1 -
 .../analytics/util/RangeEndpointCalculator.java |   1 -
 .../AbsoluteValueDoubleFunction.java            |   1 -
 .../util/valuesource/AddDoubleFunction.java     |   1 -
 .../util/valuesource/ConcatStringFunction.java  |   1 -
 .../util/valuesource/ConstDateSource.java       |   1 -
 .../util/valuesource/ConstDoubleSource.java     |   1 -
 .../util/valuesource/ConstStringSource.java     |   1 -
 .../util/valuesource/DateFieldSource.java       |   1 -
 .../util/valuesource/DateMathFunction.java      |   1 -
 .../util/valuesource/DivDoubleFunction.java     |   1 -
 .../util/valuesource/DualDoubleFunction.java    |   1 -
 .../util/valuesource/FilterFieldSource.java     |   1 -
 .../util/valuesource/LogDoubleFunction.java     |   1 -
 .../util/valuesource/MultiDateFunction.java     |   1 -
 .../util/valuesource/MultiDoubleFunction.java   |   1 -
 .../util/valuesource/MultiStringFunction.java   |   1 -
 .../valuesource/MultiplyDoubleFunction.java     |   1 -
 .../util/valuesource/NegateDoubleFunction.java  |   1 -
 .../util/valuesource/PowDoubleFunction.java     |   1 -
 .../util/valuesource/ReverseStringFunction.java |   1 -
 .../util/valuesource/SingleDoubleFunction.java  |   1 -
 .../util/valuesource/SingleStringFunction.java  |   1 -
 .../handler/component/AnalyticsComponent.java   |   1 -
 .../analytics/AbstractAnalyticsStatsTest.java   |   1 -
 .../org/apache/solr/analytics/NoFacetTest.java  |   1 -
 .../analytics/expression/ExpressionTest.java    |   1 -
 .../facet/AbstractAnalyticsFacetTest.java       |   1 -
 .../analytics/facet/FieldFacetExtrasTest.java   |   1 -
 .../solr/analytics/facet/FieldFacetTest.java    |   1 -
 .../solr/analytics/facet/QueryFacetTest.java    |   1 -
 .../solr/analytics/facet/RangeFacetTest.java    |   1 -
 .../util/valuesource/FunctionTest.java          |   1 -
 .../handler/clustering/ClusteringComponent.java |   3 +-
 .../handler/clustering/ClusteringEngine.java    |   2 +-
 .../handler/clustering/ClusteringParams.java    |   3 +-
 .../clustering/DocumentClusteringEngine.java    |   3 +-
 .../clustering/SearchClusteringEngine.java      |   3 +-
 .../carrot2/CarrotClusteringEngine.java         |   3 +-
 .../clustering/carrot2/CarrotParams.java        |  10 +-
 .../carrot2/LuceneCarrot2StemmerFactory.java    |   7 +-
 .../carrot2/LuceneCarrot2TokenizerFactory.java  |   3 +-
 .../clustering/carrot2/SolrResourceLocator.java |   1 -
 .../SolrStopwordsCarrot2LexicalDataFactory.java |   3 +-
 .../clustering/AbstractClusteringTestCase.java  |   3 +-
 .../clustering/ClusteringComponentTest.java     |   3 +-
 .../DistributedClusteringComponentTest.java     |   3 +-
 .../MockDocumentClusteringEngine.java           |   2 +-
 .../carrot2/CarrotClusteringEngineTest.java     |   3 +-
 .../carrot2/DuplicatingStemmerFactory.java      |   3 +-
 .../carrot2/DuplicatingTokenizerFactory.java    |   3 +-
 .../carrot2/EchoClusteringAlgorithm.java        |   2 +-
 .../carrot2/EchoStemsClusteringAlgorithm.java   |   4 +-
 .../carrot2/EchoTokensClusteringAlgorithm.java  |   4 +-
 ...exicalResourcesCheckClusteringAlgorithm.java |   4 +-
 .../carrot2/MockClusteringAlgorithm.java        |   2 +-
 .../handler/dataimport/CachePropertyUtil.java   |   3 +-
 .../apache/solr/handler/dataimport/Context.java |   1 -
 .../solr/handler/dataimport/ContextImpl.java    |   4 +-
 .../solr/handler/dataimport/DIHCache.java       |   3 +-
 .../handler/dataimport/DIHCacheSupport.java     |   3 +-
 .../solr/handler/dataimport/DIHLogLevels.java   |   3 +-
 .../solr/handler/dataimport/DIHProperties.java  |   5 +-
 .../solr/handler/dataimport/DIHWriter.java      |   2 +-
 .../solr/handler/dataimport/DIHWriterBase.java  |   3 +-
 .../dataimport/DataImportHandlerException.java  |   1 -
 .../solr/handler/dataimport/DataImporter.java   |   1 -
 .../solr/handler/dataimport/DataSource.java     |   1 -
 .../handler/dataimport/DateFormatEvaluator.java |  33 +-
 .../dataimport/DateFormatTransformer.java       |   1 -
 .../solr/handler/dataimport/DebugLogger.java    |   3 +-
 .../solr/handler/dataimport/DocBuilder.java     |   1 -
 .../solr/handler/dataimport/JdbcDataSource.java |  70 +-
 .../dataimport/NumberFormatTransformer.java     |   3 +-
 .../dataimport/SimplePropertiesWriter.java      |   3 +-
 .../handler/dataimport/SolrEntityProcessor.java |   3 +-
 .../dataimport/SolrQueryEscapingEvaluator.java  |  15 +-
 .../dataimport/SortedMapBackedCache.java        |   3 +-
 .../dataimport/SqlEscapingEvaluator.java        |  11 +-
 .../solr/handler/dataimport/UrlEvaluator.java   |  17 +-
 .../apache/solr/handler/dataimport/Zipper.java  |  27 +-
 .../dataimport/config/DIHConfiguration.java     |  33 +-
 .../solr/handler/dataimport/config/Entity.java  |  26 +-
 .../handler/dataimport/config/EntityField.java  |   1 -
 .../solr/handler/dataimport/config/Field.java   |   1 -
 .../dataimport/config/PropertyWriter.java       |   9 +-
 .../solr/handler/dataimport/config/Script.java  |  25 +-
 .../dataimport/AbstractDIHCacheTestCase.java    |   3 +-
 .../dataimport/AbstractDIHJdbcTestCase.java     |  30 +-
 .../AbstractSqlEntityProcessorTestCase.java     |  33 +-
 .../dataimport/AddAColumnTransformer.java       |   7 +-
 .../handler/dataimport/DestroyCountCache.java   |   3 +-
 .../dataimport/MockSolrEntityProcessor.java     |   3 +-
 .../handler/dataimport/TestEphemeralCache.java  |   3 +-
 .../handler/dataimport/TestErrorHandling.java   |   3 +-
 .../dataimport/TestFileListEntityProcessor.java |   3 +-
 .../TestFileListWithLineEntityProcessor.java    |  19 +-
 .../dataimport/TestHierarchicalDocBuilder.java  |   3 +-
 .../TestJdbcDataSourceConvertType.java          |   3 +-
 .../dataimport/TestLineEntityProcessor.java     |   3 +-
 .../handler/dataimport/TestNestedChildren.java  |  15 +-
 .../dataimport/TestSimplePropertiesWriter.java  |  33 +-
 .../TestSolrEntityProcessorEndToEnd.java        |   3 +-
 .../dataimport/TestSolrEntityProcessorUnit.java |   2 +-
 .../dataimport/TestSortedMapBackedCache.java    |   7 +-
 .../dataimport/TestSqlEntityProcessor.java      |   9 +-
 .../dataimport/TestSqlEntityProcessorDelta.java |  21 +-
 .../TestVariableResolverEndToEnd.java           |  31 +-
 .../dataimport/TestXPathRecordReader.java       |   2 +-
 .../dataimport/TestZKPropertiesWriter.java      |   7 +-
 .../dataimport/TripleThreatTransformer.java     |  16 +-
 .../handler/extraction/ParseContextConfig.java  |   3 +-
 .../extraction/RegexRulesPasswordProvider.java  |   1 -
 .../handler/extraction/SolrContentHandler.java  |   1 -
 .../ExtractingRequestHandlerTest.java           |   3 +-
 .../extraction/ParseContextConfigTest.java      |   3 +-
 .../solr/update/processor/DetectedLanguage.java |   3 +-
 ...DetectLanguageIdentifierUpdateProcessor.java |   3 +-
 ...anguageIdentifierUpdateProcessorFactory.java |   3 +-
 .../solr/update/processor/LangIdParams.java     |   3 +-
 .../LanguageIdentifierUpdateProcessor.java      |   3 +-
 .../TikaLanguageIdentifierUpdateProcessor.java  |   3 +-
 ...anguageIdentifierUpdateProcessorFactory.java |   3 +-
 ...ageIdentifierUpdateProcessorFactoryTest.java |   3 +-
 ...dentifierUpdateProcessorFactoryTestCase.java |   1 -
 ...ageIdentifierUpdateProcessorFactoryTest.java |   3 +-
 .../solr/hadoop/AlphaNumericComparator.java     |   1 -
 .../solr/hadoop/DataInputInputStream.java       |   1 -
 .../hadoop/UnbufferedDataInputInputStream.java  |   1 -
 .../apache/solr/hadoop/ZooKeeperInspector.java  |   1 -
 .../solr/hadoop/MorphlineGoLiveMiniMRTest.java  |   1 -
 .../solr/AbstractSolrMorphlineZkTestBase.java   |   1 -
 .../uima/processor/FieldMappingException.java   |   3 +-
 .../uima/processor/SolrUIMAConfiguration.java   |   3 +-
 .../processor/SolrUIMAConfigurationReader.java  |   3 +-
 .../solr/uima/processor/UIMAToSolrMapper.java   |   3 +-
 .../processor/UIMAUpdateRequestProcessor.java   |   3 +-
 .../UIMAUpdateRequestProcessorFactory.java      |   3 +-
 .../UIMATokenizersSolrIntegrationTest.java      |   3 +-
 .../UIMAUpdateRequestProcessorTest.java         |   3 +-
 .../uima/processor/an/DummyEntityAnnotator.java |  17 +-
 .../processor/an/DummyExceptionAnnotator.java   |  11 +-
 .../processor/an/DummySentimentAnnotator.java   |  21 +-
 .../java/org/apache/solr/response/PageTool.java |   1 -
 .../solr/response/SolrParamResourceLoader.java  |   1 -
 .../solr/response/SolrVelocityLogger.java       |   3 +-
 .../solr/response/VelocityResponseWriter.java   |   1 -
 .../test/org/apache/solr/velocity/MockTool.java |   3 +-
 .../velocity/VelocityResponseWriterTest.java    |   1 -
 .../solr/analysis/ReversedWildcardFilter.java   |   3 +-
 .../analysis/ReversedWildcardFilterFactory.java |   3 +-
 .../org/apache/solr/analysis/SolrAnalyzer.java  |   1 -
 .../apache/solr/analysis/TokenizerChain.java    |   1 -
 .../solrj/embedded/EmbeddedSolrServer.java      |   1 -
 .../solr/client/solrj/embedded/JettyConfig.java |   1 -
 .../client/solrj/embedded/JettySolrRunner.java  |   1 -
 .../solr/client/solrj/embedded/SSLConfig.java   |   3 +-
 .../org/apache/solr/cloud/ActionThrottle.java   |   7 +-
 .../src/java/org/apache/solr/cloud/Assign.java  |  27 +-
 .../solr/cloud/CloudConfigSetService.java       |   1 -
 .../org/apache/solr/cloud/CloudDescriptor.java  |   3 +-
 .../java/org/apache/solr/cloud/CloudUtil.java   |   3 +-
 .../cloud/CurrentCoreDescriptorProvider.java    |   3 +-
 .../org/apache/solr/cloud/DistributedMap.java   |   3 +-
 .../org/apache/solr/cloud/DistributedQueue.java |   4 +-
 .../org/apache/solr/cloud/ElectionContext.java  |   3 +-
 .../org/apache/solr/cloud/LeaderElector.java    |   3 +-
 .../cloud/LeaderInitiatedRecoveryThread.java    |  33 +-
 .../java/org/apache/solr/cloud/Overseer.java    |  27 +-
 .../OverseerAutoReplicaFailoverThread.java      |   3 +-
 .../OverseerCollectionConfigSetProcessor.java   |   3 +-
 .../cloud/OverseerCollectionMessageHandler.java |   3 +-
 .../cloud/OverseerConfigSetMessageHandler.java  |   3 +-
 .../solr/cloud/OverseerMessageHandler.java      |   3 +-
 .../solr/cloud/OverseerNodePrioritizer.java     |   7 +-
 .../apache/solr/cloud/OverseerSolrResponse.java |   3 +-
 .../solr/cloud/OverseerTaskProcessor.java       |   3 +-
 .../apache/solr/cloud/OverseerTaskQueue.java    |   7 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |   3 +-
 .../solr/cloud/SizeLimitedDistributedMap.java   |   3 +-
 .../org/apache/solr/cloud/SolrZkServer.java     |  27 +-
 .../org/apache/solr/cloud/SyncStrategy.java     |  19 +-
 .../src/java/org/apache/solr/cloud/ZkCLI.java   |  33 +-
 .../org/apache/solr/cloud/ZkController.java     |   3 +-
 .../apache/solr/cloud/ZkSolrResourceLoader.java |   3 +-
 .../cloud/overseer/ClusterStateMutator.java     |   7 +-
 .../solr/cloud/overseer/CollectionMutator.java  |   7 +-
 .../solr/cloud/overseer/OverseerAction.java     |   3 +-
 .../solr/cloud/overseer/ReplicaMutator.java     |   7 +-
 .../solr/cloud/overseer/SliceMutator.java       |   7 +-
 .../solr/cloud/overseer/ZkStateWriter.java      |   3 +-
 .../solr/cloud/overseer/ZkWriteCommand.java     |   3 +-
 .../apache/solr/cloud/rule/ImplicitSnitch.java  |   4 +-
 .../apache/solr/cloud/rule/RemoteCallback.java  |   3 +-
 .../apache/solr/cloud/rule/ReplicaAssigner.java |   7 +-
 .../java/org/apache/solr/cloud/rule/Rule.java   |   4 +-
 .../java/org/apache/solr/cloud/rule/Snitch.java |   3 +-
 .../apache/solr/cloud/rule/SnitchContext.java   |   3 +-
 .../solr/core/AbstractSolrEventListener.java    |   1 -
 .../solr/core/CachingDirectoryFactory.java      |   3 +-
 .../java/org/apache/solr/core/CloseHook.java    |   4 +-
 .../java/org/apache/solr/core/CloudConfig.java  |   3 +-
 .../java/org/apache/solr/core/CodecFactory.java |   3 +-
 .../src/java/org/apache/solr/core/Config.java   |   1 -
 .../org/apache/solr/core/ConfigOverlay.java     |   3 +-
 .../java/org/apache/solr/core/ConfigSet.java    |   1 -
 .../apache/solr/core/ConfigSetProperties.java   |   1 -
 .../org/apache/solr/core/ConfigSetService.java  |   1 -
 .../org/apache/solr/core/CoreContainer.java     |  59 +-
 .../org/apache/solr/core/CoreDescriptor.java    |   1 -
 .../apache/solr/core/CorePropertiesLocator.java |   3 +-
 .../java/org/apache/solr/core/CoresLocator.java |   3 +-
 .../java/org/apache/solr/core/Diagnostics.java  |   4 +-
 .../org/apache/solr/core/DirectoryFactory.java  |   3 +-
 .../solr/core/EphemeralDirectoryFactory.java    |   3 +-
 .../apache/solr/core/HdfsDirectoryFactory.java  |   3 +-
 .../org/apache/solr/core/ImplicitPlugins.java   |   4 +-
 .../solr/core/IndexDeletionPolicyWrapper.java   |   3 +-
 .../apache/solr/core/IndexReaderFactory.java    |   3 +-
 .../java/org/apache/solr/core/InitParams.java   |   3 +-
 .../org/apache/solr/core/JarRepository.java     |   3 +-
 .../apache/solr/core/MMapDirectoryFactory.java  |   4 +-
 .../org/apache/solr/core/MapSerializable.java   |   4 +-
 .../org/apache/solr/core/MemClassLoader.java    |   3 +-
 .../apache/solr/core/NIOFSDirectoryFactory.java |   3 +-
 .../solr/core/NRTCachingDirectoryFactory.java   |   1 -
 .../java/org/apache/solr/core/NodeConfig.java   |   3 +-
 .../java/org/apache/solr/core/PluginBag.java    |   4 +-
 .../apache/solr/core/QuerySenderListener.java   |   1 -
 .../apache/solr/core/RAMDirectoryFactory.java   |   1 -
 .../org/apache/solr/core/RequestHandlers.java   |   1 -
 .../org/apache/solr/core/RequestParams.java     |   3 +-
 .../apache/solr/core/RunExecutableListener.java |   1 -
 .../apache/solr/core/SchemaCodecFactory.java    |  33 +-
 .../solr/core/SimpleFSDirectoryFactory.java     |   3 +-
 .../java/org/apache/solr/core/SolrConfig.java   |   1 -
 .../src/java/org/apache/solr/core/SolrCore.java |   1 -
 .../java/org/apache/solr/core/SolrCores.java    |   3 +-
 .../apache/solr/core/SolrDeletionPolicy.java    |   3 +-
 .../org/apache/solr/core/SolrEventListener.java |   1 -
 .../org/apache/solr/core/SolrInfoMBean.java     |   1 -
 .../apache/solr/core/SolrResourceLoader.java    |   1 -
 .../core/SolrResourceNotFoundException.java     |   1 -
 .../org/apache/solr/core/SolrXmlConfig.java     |   3 +-
 .../solr/core/StandardDirectoryFactory.java     |   3 +-
 .../solr/core/StandardIndexReaderFactory.java   |   3 +-
 .../java/org/apache/solr/core/ZkContainer.java  |   3 +-
 .../handler/AnalysisRequestHandlerBase.java     |   1 -
 .../org/apache/solr/handler/BlobHandler.java    |   3 +-
 .../apache/solr/handler/CdcrBufferManager.java  |   3 +-
 .../solr/handler/CdcrBufferStateManager.java    |   3 +-
 .../solr/handler/CdcrLeaderStateManager.java    |   7 +-
 .../org/apache/solr/handler/CdcrParams.java     |   3 +-
 .../solr/handler/CdcrProcessStateManager.java   |   7 +-
 .../org/apache/solr/handler/CdcrReplicator.java |   3 +-
 .../solr/handler/CdcrReplicatorManager.java     |   3 +-
 .../solr/handler/CdcrReplicatorScheduler.java   |   3 +-
 .../solr/handler/CdcrReplicatorState.java       |   3 +-
 .../apache/solr/handler/CdcrRequestHandler.java |   3 +-
 .../apache/solr/handler/CdcrStateManager.java   |   3 +-
 .../solr/handler/CdcrUpdateLogSynchronizer.java |  15 +-
 .../solr/handler/ContentStreamHandlerBase.java  |   3 +-
 .../solr/handler/ContentStreamLoader.java       |   4 +-
 .../handler/DocumentAnalysisRequestHandler.java |   1 -
 .../apache/solr/handler/DumpRequestHandler.java |   1 -
 .../handler/FieldAnalysisRequestHandler.java    |   1 -
 .../solr/handler/MoreLikeThisHandler.java       |   1 -
 .../solr/handler/NestedRequestHandler.java      |   3 +-
 .../solr/handler/NotFoundRequestHandler.java    |   3 +-
 .../apache/solr/handler/OldBackupDirectory.java |   3 +-
 .../apache/solr/handler/PingRequestHandler.java |   1 -
 .../apache/solr/handler/RealTimeGetHandler.java |   1 -
 .../apache/solr/handler/RequestHandlerBase.java |   1 -
 .../solr/handler/RequestHandlerUtils.java       |   1 -
 .../org/apache/solr/handler/RestoreCore.java    |   4 +-
 .../org/apache/solr/handler/SQLHandler.java     | 200 +++-
 .../org/apache/solr/handler/SchemaHandler.java  |   4 +-
 .../apache/solr/handler/SolrConfigHandler.java  |   4 +-
 .../solr/handler/StandardRequestHandler.java    |   1 -
 .../org/apache/solr/handler/StreamHandler.java  |   1 -
 .../solr/handler/UpdateRequestHandler.java      |   1 -
 .../solr/handler/admin/AdminHandlers.java       |   1 -
 .../solr/handler/admin/ClusterStatus.java       |   4 +-
 .../solr/handler/admin/ConfigSetsHandler.java   |   7 +-
 .../solr/handler/admin/CoreAdminHandler.java    |   1 -
 .../solr/handler/admin/CoreAdminOperation.java  |   3 +-
 .../apache/solr/handler/admin/InfoHandler.java  |   3 +-
 .../solr/handler/admin/LoggingHandler.java      |   3 +-
 .../solr/handler/admin/LukeRequestHandler.java  |  21 +-
 .../solr/handler/admin/PluginInfoHandler.java   |   1 -
 .../handler/admin/PropertiesRequestHandler.java |   1 -
 .../solr/handler/admin/RebalanceLeaders.java    |  33 +-
 .../solr/handler/admin/SecurityConfHandler.java |   3 +-
 .../admin/SegmentsInfoRequestHandler.java       |  33 +-
 .../handler/admin/ShowFileRequestHandler.java   |   1 -
 .../handler/admin/SolrInfoMBeanHandler.java     |   3 +-
 .../solr/handler/admin/SystemInfoHandler.java   |   1 -
 .../solr/handler/admin/ThreadDumpHandler.java   |   1 -
 .../handler/admin/ZookeeperInfoHandler.java     |   1 -
 .../handler/component/DateFacetProcessor.java   |   3 +-
 .../solr/handler/component/DebugComponent.java  |   1 -
 .../solr/handler/component/ExpandComponent.java |   1 -
 .../solr/handler/component/FacetComponent.java  |   1 -
 .../solr/handler/component/FieldFacetStats.java |   3 +-
 .../handler/component/HighlightComponent.java   |   1 -
 .../handler/component/HttpShardHandler.java     |   3 +-
 .../component/HttpShardHandlerFactory.java      |   3 +-
 .../component/IterativeMergeStrategy.java       |  31 +-
 .../solr/handler/component/MergeStrategy.java   |  31 +-
 .../component/MoreLikeThisComponent.java        |   1 -
 .../solr/handler/component/PivotFacet.java      |   1 -
 .../solr/handler/component/PivotFacetField.java |   1 -
 .../PivotFacetFieldValueCollection.java         |   3 +-
 .../handler/component/PivotFacetHelper.java     |   1 -
 .../handler/component/PivotFacetProcessor.java  |   3 +-
 .../solr/handler/component/PivotFacetValue.java |   3 +-
 .../solr/handler/component/QueryComponent.java  |  49 +-
 .../component/QueryElevationComponent.java      |   1 -
 .../handler/component/RangeFacetProcessor.java  |   3 +-
 .../handler/component/RangeFacetRequest.java    |   7 +-
 .../handler/component/RealTimeGetComponent.java |  11 +-
 .../solr/handler/component/ResponseBuilder.java |   5 +-
 .../handler/component/ResponseLogComponent.java |   3 +-
 .../solr/handler/component/SearchComponent.java |   1 -
 .../solr/handler/component/SearchHandler.java   |   1 -
 .../apache/solr/handler/component/ShardDoc.java | 166 +---
 .../component/ShardFieldSortedHitQueue.java     | 178 ++++
 .../solr/handler/component/ShardHandler.java    |   4 +-
 .../handler/component/ShardHandlerFactory.java  |   4 +-
 .../solr/handler/component/ShardResponse.java   |   3 +-
 .../handler/component/SpatialHeatmapFacets.java |   3 +-
 .../handler/component/SpellCheckComponent.java  |   1 -
 .../handler/component/SpellCheckMergeData.java  |   3 +-
 .../solr/handler/component/StatsComponent.java  |   1 -
 .../solr/handler/component/StatsField.java      |   1 -
 .../solr/handler/component/StatsValues.java     |   2 -
 .../handler/component/StatsValuesFactory.java   |   3 +-
 .../handler/component/SuggestComponent.java     |   3 +-
 .../handler/component/TermVectorComponent.java  |  34 +-
 .../solr/handler/component/TermsComponent.java  |   3 +-
 .../apache/solr/handler/loader/CSVLoader.java   |   1 -
 .../solr/handler/loader/CSVLoaderBase.java      |   1 -
 .../handler/loader/ContentStreamLoader.java     |   4 +-
 .../solr/handler/loader/JavabinLoader.java      |   1 -
 .../apache/solr/handler/loader/JsonLoader.java  |   3 +-
 .../apache/solr/handler/loader/XMLLoader.java   |   3 +-
 .../highlight/BreakIteratorBoundaryScanner.java |   1 -
 .../apache/solr/highlight/DefaultEncoder.java   |   1 -
 .../solr/highlight/HighlightingPluginBase.java  |   1 -
 .../org/apache/solr/highlight/HtmlEncoder.java  |   1 -
 .../solr/highlight/PostingsSolrHighlighter.java |   3 +-
 .../highlight/ScoreOrderFragmentsBuilder.java   |   1 -
 .../solr/highlight/SimpleBoundaryScanner.java   |   1 -
 .../solr/highlight/SimpleFragListBuilder.java   |   1 -
 .../solr/highlight/SimpleFragmentsBuilder.java  |   1 -
 .../solr/highlight/SingleFragListBuilder.java   |   1 -
 .../solr/highlight/SolrBoundaryScanner.java     |   1 -
 .../org/apache/solr/highlight/SolrEncoder.java  |   1 -
 .../apache/solr/highlight/SolrFormatter.java    |   1 -
 .../solr/highlight/SolrFragListBuilder.java     |   1 -
 .../apache/solr/highlight/SolrFragmenter.java   |   1 -
 .../solr/highlight/SolrFragmentsBuilder.java    |   1 -
 .../apache/solr/highlight/SolrHighlighter.java  |   3 +-
 .../solr/highlight/WeightedFragListBuilder.java |   1 -
 .../apache/solr/index/hdfs/CheckHdfsIndex.java  |   3 +-
 .../org/apache/solr/internal/csv/CSVParser.java |   6 +-
 .../apache/solr/internal/csv/CSVPrinter.java    |   6 +-
 .../apache/solr/internal/csv/CSVStrategy.java   |   6 +-
 .../org/apache/solr/internal/csv/CSVUtils.java  |   6 +-
 .../apache/solr/internal/csv/CharBuffer.java    |  26 +-
 .../internal/csv/ExtendedBufferedReader.java    |   6 +-
 .../solr/internal/csv/writer/CSVConfig.java     |  26 +-
 .../internal/csv/writer/CSVConfigGuesser.java   |  26 +-
 .../solr/internal/csv/writer/CSVField.java      |  26 +-
 .../solr/internal/csv/writer/CSVWriter.java     |  26 +-
 .../org/apache/solr/logging/CircularList.java   |   1 -
 .../org/apache/solr/logging/ListenerConfig.java |   5 +-
 .../org/apache/solr/logging/LogWatcher.java     |   1 -
 .../apache/solr/logging/LogWatcherConfig.java   |   3 +-
 .../org/apache/solr/logging/LoggerInfo.java     |   1 -
 .../apache/solr/logging/MDCLoggingContext.java  |   3 +-
 .../org/apache/solr/parser/FastCharStream.java  |   5 +-
 .../java/org/apache/solr/parser/QueryParser.jj  |   2 +-
 .../solr/parser/QueryParserTokenManager.java    | 426 ++++----
 .../apache/solr/parser/SolrQueryParserBase.java |   1 -
 .../java/org/apache/solr/query/FilterQuery.java |   3 +-
 .../org/apache/solr/query/SolrRangeQuery.java   |   3 +-
 .../apache/solr/request/DocValuesFacets.java    |   3 +-
 .../org/apache/solr/request/DocValuesStats.java |   3 +-
 .../org/apache/solr/request/IntervalFacets.java |  33 +-
 .../solr/request/LocalSolrQueryRequest.java     |   1 -
 .../org/apache/solr/request/NumericFacets.java  |   3 +-
 .../request/PerSegmentSingleValuedFaceting.java |   1 -
 .../org/apache/solr/request/SimpleFacets.java   |   1 -
 .../apache/solr/request/SolrQueryRequest.java   |   1 -
 .../solr/request/SolrQueryRequestBase.java      |   1 -
 .../apache/solr/request/SolrRequestHandler.java |   1 -
 .../apache/solr/request/SolrRequestInfo.java    |   1 -
 .../org/apache/solr/request/json/JSONUtil.java  |   4 +-
 .../apache/solr/request/json/ObjectUtil.java    |   4 +-
 .../apache/solr/request/json/RequestUtil.java   |   4 +-
 .../solr/request/macro/MacroExpander.java       |   3 +-
 .../solr/response/BasicResultContext.java       |   3 +-
 .../response/BinaryQueryResponseWriter.java     |   4 +-
 .../apache/solr/response/CSVResponseWriter.java |   1 -
 .../org/apache/solr/response/DocsStreamer.java  |   3 +-
 .../solr/response/JSONResponseWriter.java       |   1 -
 .../apache/solr/response/PHPResponseWriter.java |   1 -
 .../response/PHPSerializedResponseWriter.java   |   1 -
 .../solr/response/PythonResponseWriter.java     |   1 -
 .../solr/response/QueryResponseWriter.java      |   1 -
 .../solr/response/QueryResponseWriterUtil.java  |   1 -
 .../apache/solr/response/RawResponseWriter.java |   1 -
 .../org/apache/solr/response/ResultContext.java |   1 -
 .../solr/response/SchemaXmlResponseWriter.java  |   1 -
 .../apache/solr/response/SchemaXmlWriter.java   |   3 +-
 .../solr/response/SmileResponseWriter.java      |   4 +-
 .../apache/solr/response/SolrQueryResponse.java |   1 -
 .../solr/response/SortingResponseWriter.java    | 101 +-
 .../solr/response/TextResponseWriter.java       |   1 -
 .../apache/solr/response/XMLResponseWriter.java |   1 -
 .../org/apache/solr/response/XMLWriter.java     |   1 -
 .../solr/response/XSLTResponseWriter.java       |   1 -
 .../transform/BaseEditorialTransformer.java     |   5 +-
 .../solr/response/transform/DocTransformer.java |   1 -
 .../response/transform/DocTransformers.java     |   1 -
 .../transform/ElevatedMarkerFactory.java        |   3 +-
 .../transform/ExcludedMarkerFactory.java        |   3 +-
 .../response/transform/TransformerFactory.java  |   1 -
 .../org/apache/solr/rest/BaseSolrResource.java  |   3 +-
 .../java/org/apache/solr/rest/DELETEable.java   |   3 +-
 .../src/java/org/apache/solr/rest/GETable.java  |   3 +-
 .../org/apache/solr/rest/ManagedResource.java   |   3 +-
 .../solr/rest/ManagedResourceObserver.java      |   3 +-
 .../solr/rest/ManagedResourceStorage.java       |   3 +-
 .../src/java/org/apache/solr/rest/POSTable.java |   3 +-
 .../src/java/org/apache/solr/rest/PUTable.java  |   3 +-
 .../java/org/apache/solr/rest/RestManager.java  |   3 +-
 .../org/apache/solr/rest/SolrSchemaRestApi.java |   3 +-
 .../solr/rest/schema/BaseFieldResource.java     |   3 +-
 .../solr/rest/schema/BaseFieldTypeResource.java |   3 +-
 .../schema/CopyFieldCollectionResource.java     |   4 +-
 .../schema/DynamicFieldCollectionResource.java  |   3 +-
 .../solr/rest/schema/DynamicFieldResource.java  |   4 +-
 .../rest/schema/FieldCollectionResource.java    |   4 +-
 .../apache/solr/rest/schema/FieldResource.java  |   3 +-
 .../schema/FieldTypeCollectionResource.java     |   3 +-
 .../solr/rest/schema/FieldTypeResource.java     |   3 +-
 .../solr/rest/schema/FieldTypeXmlAdapter.java   |   3 +-
 .../analysis/BaseManagedTokenFilterFactory.java |   3 +-
 .../analysis/ManagedStopFilterFactory.java      |   3 +-
 .../analysis/ManagedSynonymFilterFactory.java   |   3 +-
 .../schema/analysis/ManagedWordSetResource.java |   3 +-
 .../solr/schema/AbstractSpatialFieldType.java   |   3 +-
 .../AbstractSpatialPrefixTreeFieldType.java     |   3 +-
 .../solr/schema/AbstractSubTypeFieldType.java   |   3 +-
 .../java/org/apache/solr/schema/BBoxField.java  |   3 +-
 .../org/apache/solr/schema/BinaryField.java     |   1 -
 .../java/org/apache/solr/schema/BoolField.java  |   1 -
 .../solr/schema/ClassicIndexSchemaFactory.java  |   3 +-
 .../org/apache/solr/schema/CollationField.java  |   3 +-
 .../apache/solr/schema/CoordinateFieldType.java |   1 -
 .../java/org/apache/solr/schema/CopyField.java  |   1 -
 .../org/apache/solr/schema/CurrencyField.java   |   3 +-
 .../org/apache/solr/schema/DateRangeField.java  |   3 +-
 .../apache/solr/schema/DateValueFieldType.java  |   1 -
 .../solr/schema/DoubleValueFieldType.java       |   1 -
 .../java/org/apache/solr/schema/EnumField.java  |   3 +-
 .../solr/schema/ExchangeRateProvider.java       |   3 +-
 .../solr/schema/ExternalFileFieldReloader.java  |   1 -
 .../org/apache/solr/schema/FieldProperties.java |   1 -
 .../java/org/apache/solr/schema/FieldType.java  |   1 -
 .../solr/schema/FieldTypePluginLoader.java      |   1 -
 .../apache/solr/schema/FloatValueFieldType.java |   1 -
 .../org/apache/solr/schema/GeoHashField.java    |   1 -
 .../org/apache/solr/schema/IndexSchema.java     |   1 -
 .../apache/solr/schema/IndexSchemaFactory.java  |   3 +-
 .../apache/solr/schema/IntValueFieldType.java   |   1 -
 .../solr/schema/JsonPreAnalyzedParser.java      |  33 +-
 .../java/org/apache/solr/schema/LatLonType.java |   3 +-
 .../apache/solr/schema/LongValueFieldType.java  |   1 -
 .../apache/solr/schema/ManagedIndexSchema.java  |   7 +-
 .../solr/schema/ManagedIndexSchemaFactory.java  |   3 +-
 .../solr/schema/NumericValueFieldType.java      |   1 -
 .../schema/OpenExchangeRatesOrgProvider.java    |   3 +-
 .../java/org/apache/solr/schema/PointType.java  |   1 -
 .../apache/solr/schema/PreAnalyzedField.java    |   3 +-
 .../apache/solr/schema/PrimitiveFieldType.java  |   1 -
 .../org/apache/solr/schema/RandomSortField.java |   1 -
 .../schema/RptWithGeometrySpatialField.java     |   3 +-
 .../org/apache/solr/schema/SchemaAware.java     |   4 +-
 .../org/apache/solr/schema/SchemaField.java     |   1 -
 .../org/apache/solr/schema/SchemaManager.java   |   4 +-
 .../apache/solr/schema/SimilarityFactory.java   |   3 +-
 .../solr/schema/SimplePreAnalyzedParser.java    |   3 +-
 .../schema/SpatialPointVectorFieldType.java     |   3 +-
 .../apache/solr/schema/SpatialQueryable.java    |   4 +-
 .../SpatialRecursivePrefixTreeFieldType.java    |   3 +-
 .../SpatialTermQueryPrefixTreeFieldType.java    |   1 -
 .../java/org/apache/solr/schema/StrField.java   |   1 -
 .../org/apache/solr/schema/StrFieldSource.java  |   1 -
 .../java/org/apache/solr/schema/TextField.java  |   1 -
 .../org/apache/solr/schema/TrieDateField.java   |   1 -
 .../org/apache/solr/schema/TrieDoubleField.java |   1 -
 .../org/apache/solr/schema/TrieFloatField.java  |   1 -
 .../org/apache/solr/schema/TrieIntField.java    |   1 -
 .../org/apache/solr/schema/TrieLongField.java   |   1 -
 .../java/org/apache/solr/schema/UUIDField.java  |   3 +-
 .../apache/solr/schema/ZkIndexSchemaReader.java |   3 +-
 .../org/apache/solr/search/AnalyticsQuery.java  |  31 +-
 .../java/org/apache/solr/search/BitDocSet.java  |   1 -
 .../solr/search/BitsFilteredDocIdSet.java       |   3 +-
 .../solr/search/BitsFilteredPostingsEnum.java   |   3 +-
 .../apache/solr/search/BoostQParserPlugin.java  |   4 -
 .../org/apache/solr/search/CacheConfig.java     |   1 -
 .../apache/solr/search/CacheRegenerator.java    |   1 -
 .../solr/search/CollapsingQParserPlugin.java    |   5 -
 .../solr/search/ComplexPhraseQParserPlugin.java |   4 +-
 .../java/org/apache/solr/search/CursorMark.java |   1 -
 .../apache/solr/search/DelegatingCollector.java |   1 -
 .../apache/solr/search/DisMaxQParserPlugin.java |   4 -
 .../org/apache/solr/search/DocIterator.java     |   1 -
 .../java/org/apache/solr/search/DocList.java    |   1 -
 .../org/apache/solr/search/DocListAndSet.java   |   1 -
 .../src/java/org/apache/solr/search/DocSet.java |   1 -
 .../java/org/apache/solr/search/DocSetBase.java |   1 -
 .../org/apache/solr/search/DocSetBuilder.java   |   3 +-
 .../org/apache/solr/search/DocSetCollector.java |   3 +-
 .../org/apache/solr/search/DocSetProducer.java  |   3 +-
 .../java/org/apache/solr/search/DocSetUtil.java |   4 +-
 .../java/org/apache/solr/search/DocSlice.java   |   1 -
 .../solr/search/EarlyTerminatingCollector.java  |   3 +-
 .../EarlyTerminatingCollectorException.java     |   4 +-
 .../apache/solr/search/ExportQParserPlugin.java |   4 -
 .../solr/search/ExtendedDismaxQParser.java      |   1 -
 .../search/ExtendedDismaxQParserPlugin.java     |   5 -
 .../org/apache/solr/search/ExtendedQuery.java   |   1 -
 .../apache/solr/search/ExtendedQueryBase.java   |   1 -
 .../org/apache/solr/search/FastLRUCache.java    |   3 +-
 .../org/apache/solr/search/FieldParams.java     |   3 +-
 .../apache/solr/search/FieldQParserPlugin.java  |   4 -
 .../src/java/org/apache/solr/search/Filter.java |   3 +-
 .../apache/solr/search/FilteredDocIdSet.java    |   3 +-
 .../solr/search/FunctionQParserPlugin.java      |   4 -
 .../solr/search/FunctionRangeQParserPlugin.java |   4 -
 .../apache/solr/search/FunctionRangeQuery.java  |   1 -
 .../java/org/apache/solr/search/Grouping.java   |   1 -
 .../java/org/apache/solr/search/HashDocSet.java |   1 -
 .../apache/solr/search/HashQParserPlugin.java   |   5 -
 .../java/org/apache/solr/search/Insanity.java   |   3 +-
 .../apache/solr/search/JoinQParserPlugin.java   |   4 -
 .../java/org/apache/solr/search/LFUCache.java   |   3 +-
 .../java/org/apache/solr/search/LRUCache.java   |   1 -
 .../apache/solr/search/LuceneQParserPlugin.java |   4 -
 .../apache/solr/search/NestedQParserPlugin.java |   4 -
 .../org/apache/solr/search/NoOpRegenerator.java |   3 +-
 .../solr/search/OldLuceneQParserPlugin.java     |   4 -
 .../java/org/apache/solr/search/PostFilter.java |   1 -
 .../apache/solr/search/PrefixQParserPlugin.java |   4 -
 .../org/apache/solr/search/QParserPlugin.java   |   4 +
 .../org/apache/solr/search/QueryCommand.java    |   3 +-
 .../org/apache/solr/search/QueryContext.java    |   3 +-
 .../org/apache/solr/search/QueryParsing.java    |   1 -
 .../org/apache/solr/search/QueryResult.java     |   3 +-
 .../org/apache/solr/search/QueryResultKey.java  |   1 -
 .../java/org/apache/solr/search/QueryUtils.java |   1 -
 .../apache/solr/search/QueryWrapperFilter.java  |   3 +-
 .../java/org/apache/solr/search/RankQuery.java  |  31 +-
 .../apache/solr/search/RawQParserPlugin.java    |   4 -
 .../apache/solr/search/ReRankQParserPlugin.java |  29 +-
 .../org/apache/solr/search/ScoreFilter.java     |   1 -
 .../apache/solr/search/SimpleQParserPlugin.java |   8 +-
 .../java/org/apache/solr/search/SolrCache.java  |   1 -
 .../org/apache/solr/search/SolrCacheBase.java   |   1 -
 .../solr/search/SolrConstantScoreQuery.java     |  31 +-
 .../org/apache/solr/search/SolrCoreParser.java  |   3 +-
 .../apache/solr/search/SolrFieldCacheMBean.java |   1 -
 .../java/org/apache/solr/search/SolrFilter.java |   1 -
 .../apache/solr/search/SolrIndexSearcher.java   |   1 -
 .../org/apache/solr/search/SolrQueryParser.java |   1 -
 .../solr/search/SolrQueryTimeoutImpl.java       |   3 +-
 .../java/org/apache/solr/search/SortSpec.java   |   1 -
 .../org/apache/solr/search/SortSpecParsing.java |  31 +-
 .../org/apache/solr/search/SortedIntDocSet.java |   1 -
 .../java/org/apache/solr/search/Sorting.java    |   1 -
 .../solr/search/SpatialBoxQParserPlugin.java    |   6 -
 .../solr/search/SpatialFilterQParser.java       |   4 +-
 .../solr/search/SpatialFilterQParserPlugin.java |   8 +-
 .../org/apache/solr/search/SpatialOptions.java  |   3 +-
 .../java/org/apache/solr/search/StrParser.java  |   7 +-
 .../solr/search/SurroundQParserPlugin.java      |   8 +-
 .../apache/solr/search/SwitchQParserPlugin.java |   4 -
 .../org/apache/solr/search/SyntaxError.java     |   1 -
 .../apache/solr/search/TermQParserPlugin.java   |   4 -
 .../apache/solr/search/TermsQParserPlugin.java  |   7 +-
 .../org/apache/solr/search/WrappedQuery.java    |   1 -
 .../apache/solr/search/XmlQParserPlugin.java    |   7 +-
 .../solr/search/facet/AggValueSource.java       |   3 +-
 .../org/apache/solr/search/facet/AvgAgg.java    |   3 +-
 .../org/apache/solr/search/facet/BlockJoin.java |   4 +-
 .../org/apache/solr/search/facet/CountAgg.java  |   3 +-
 .../solr/search/facet/FacetDebugInfo.java       |   1 -
 .../apache/solr/search/facet/FacetField.java    |   3 +-
 .../search/facet/FacetFieldProcessorDV.java     |   3 +-
 .../facet/FacetFieldProcessorNumeric.java       |   3 +-
 .../apache/solr/search/facet/FacetMerger.java   |   3 +-
 .../apache/solr/search/facet/FacetModule.java   |   3 +-
 .../solr/search/facet/FacetProcessor.java       |   3 +-
 .../apache/solr/search/facet/FacetQuery.java    |   3 +-
 .../apache/solr/search/facet/FacetRange.java    |   3 +-
 .../apache/solr/search/facet/FacetRequest.java  |  13 +-
 .../org/apache/solr/search/facet/FieldUtil.java |   3 +-
 .../org/apache/solr/search/facet/HLLAgg.java    |   3 +-
 .../apache/solr/search/facet/LegacyFacet.java   |   4 +-
 .../org/apache/solr/search/facet/MaxAgg.java    |   3 +-
 .../org/apache/solr/search/facet/MinAgg.java    |   3 +-
 .../apache/solr/search/facet/PercentileAgg.java |   3 +-
 .../solr/search/facet/SimpleAggValueSource.java |   3 +-
 .../org/apache/solr/search/facet/SlotAcc.java   |   3 +-
 .../solr/search/facet/StrAggValueSource.java    |   3 +-
 .../org/apache/solr/search/facet/SumAgg.java    |   3 +-
 .../org/apache/solr/search/facet/SumsqAgg.java  |   3 +-
 .../solr/search/facet/UnInvertedField.java      |   1 -
 .../org/apache/solr/search/facet/UniqueAgg.java |   3 +-
 .../apache/solr/search/facet/UniqueSlotAcc.java |   3 +-
 .../search/function/CollapseScoreFunction.java  |   1 -
 .../solr/search/function/OrdFieldSource.java    |   1 -
 .../search/function/ReverseOrdFieldSource.java  |   1 -
 .../search/function/ValueSourceRangeFilter.java |   1 -
 .../distance/GeoDistValueSourceParser.java      |   3 +-
 .../function/distance/GeohashFunction.java      |   3 +-
 .../distance/GeohashHaversineFunction.java      |   4 +-
 .../distance/HaversineConstFunction.java        |   3 +-
 .../function/distance/HaversineFunction.java    |   3 +-
 .../distance/SquaredEuclideanFunction.java      |   3 +-
 .../distance/StringDistanceFunction.java        |   3 +-
 .../distance/VectorDistanceFunction.java        |   3 +-
 .../apache/solr/search/grouping/Command.java    |   3 +-
 .../solr/search/grouping/CommandHandler.java    |   3 +-
 .../search/grouping/GroupingSpecification.java  |   3 +-
 .../grouping/collector/FilterCollector.java     |   3 +-
 .../distributed/ShardRequestFactory.java        |   3 +-
 .../distributed/ShardResponseProcessor.java     |   3 +-
 .../distributed/command/GroupConverter.java     |   3 +-
 .../distributed/command/QueryCommand.java       |   3 +-
 .../distributed/command/QueryCommandResult.java |   3 +-
 .../command/SearchGroupsFieldCommand.java       |   3 +-
 .../command/SearchGroupsFieldCommandResult.java |   3 +-
 .../command/TopGroupsFieldCommand.java          |   3 +-
 .../SearchGroupsRequestFactory.java             |   3 +-
 .../StoredFieldsShardRequestFactory.java        |   3 +-
 .../TopGroupsShardRequestFactory.java           |   3 +-
 .../SearchGroupShardResponseProcessor.java      |   3 +-
 .../StoredFieldsShardResponseProcessor.java     |   3 +-
 .../TopGroupsShardResponseProcessor.java        |   3 +-
 .../SearchGroupsResultTransformer.java          |   3 +-
 .../ShardResultTransformer.java                 |   3 +-
 .../TopGroupsResultTransformer.java             |   3 +-
 .../EndResultTransformer.java                   |   3 +-
 .../GroupedEndResultTransformer.java            |   3 +-
 .../MainEndResultTransformer.java               |   3 +-
 .../SimpleEndResultTransformer.java             |   3 +-
 .../apache/solr/search/join/BitSetSlice.java    |   1 -
 .../solr/search/join/BlockJoinChildQParser.java |   1 -
 .../join/BlockJoinChildQParserPlugin.java       |   1 -
 .../join/BlockJoinDocSetFacetComponent.java     |  33 +-
 .../search/join/BlockJoinFacetCollector.java    |   3 +-
 .../search/join/BlockJoinFacetComponent.java    |   3 +-
 .../solr/search/join/BlockJoinFacetFilter.java  |   3 +-
 .../join/BlockJoinFieldFacetAccumulator.java    |   3 +-
 .../search/join/BlockJoinParentQParser.java     |   1 -
 .../join/BlockJoinParentQParserPlugin.java      |   5 -
 .../apache/solr/search/join/FrontierQuery.java  |   3 +-
 .../solr/search/join/GraphQParserPlugin.java    |   7 +-
 .../org/apache/solr/search/join/GraphQuery.java |  92 +-
 .../solr/search/join/GraphQueryParser.java      |   3 +-
 .../solr/search/join/GraphTermsCollector.java   |   5 +-
 .../search/join/ScoreJoinQParserPlugin.java     |   5 -
 .../solr/search/join/ScoreModeParser.java       |  19 +-
 .../apache/solr/search/mlt/CloudMLTQParser.java |   3 +-
 .../solr/search/mlt/MLTQParserPlugin.java       |   8 +-
 .../solr/search/mlt/SimpleMLTQParser.java       |   3 +-
 .../similarities/BM25SimilarityFactory.java     |   3 +-
 .../similarities/ClassicSimilarityFactory.java  |   3 +-
 .../similarities/DFISimilarityFactory.java      |   3 +-
 .../similarities/DFRSimilarityFactory.java      |   3 +-
 .../similarities/IBSimilarityFactory.java       |   3 +-
 .../LMDirichletSimilarityFactory.java           |   3 +-
 .../LMJelinekMercerSimilarityFactory.java       |   3 +-
 .../similarities/SchemaSimilarityFactory.java   |   3 +-
 .../SweetSpotSimilarityFactory.java             |   3 +-
 .../solr/search/stats/CachedSearcherStats.java  |   3 +-
 .../solr/search/stats/CollectionStats.java      |   5 +-
 .../search/stats/ExactSharedStatsCache.java     |   3 +-
 .../solr/search/stats/ExactStatsCache.java      |   3 +-
 .../apache/solr/search/stats/LRUStatsCache.java |   3 +-
 .../solr/search/stats/LocalStatsCache.java      |   7 +-
 .../solr/search/stats/LocalStatsSource.java     |   3 +-
 .../apache/solr/search/stats/StatsCache.java    |   3 +-
 .../apache/solr/search/stats/StatsSource.java   |   3 +-
 .../org/apache/solr/search/stats/StatsUtil.java |   7 +-
 .../org/apache/solr/search/stats/TermStats.java |   3 +-
 .../solr/security/AuthenticationPlugin.java     |  33 +-
 .../solr/security/AuthorizationContext.java     |   3 +-
 .../solr/security/AuthorizationPlugin.java      |   3 +-
 .../solr/security/AuthorizationResponse.java    |   3 +-
 .../apache/solr/security/BasicAuthPlugin.java   |   4 +-
 .../solr/security/ConfigEditablePlugin.java     |   3 +-
 .../security/HttpClientInterceptorPlugin.java   |   4 +-
 .../apache/solr/security/KerberosFilter.java    |  25 +-
 .../apache/solr/security/KerberosPlugin.java    |  33 +-
 .../solr/security/PKIAuthenticationPlugin.java  |   3 +-
 .../security/RuleBasedAuthorizationPlugin.java  |   3 +-
 .../solr/security/SecurityPluginHolder.java     |   4 +-
 .../security/Sha256AuthenticationProvider.java  |   3 +-
 .../org/apache/solr/servlet/BaseSolrFilter.java |   1 -
 .../apache/solr/servlet/BaseSolrServlet.java    |   1 -
 .../solr/servlet/CheckLoggingConfiguration.java |   1 -
 .../solr/servlet/DirectSolrConnection.java      |   1 -
 .../org/apache/solr/servlet/HttpSolrCall.java   |   7 +-
 .../apache/solr/servlet/LoadAdminUiServlet.java |   1 -
 .../apache/solr/servlet/RedirectServlet.java    |   1 -
 .../org/apache/solr/servlet/ResponseUtils.java  |   3 +-
 .../apache/solr/servlet/SolrDispatchFilter.java |   1 -
 .../apache/solr/servlet/SolrRequestParsers.java |   1 -
 .../solr/servlet/cache/HttpCacheHeaderUtil.java |   1 -
 .../org/apache/solr/servlet/cache/Method.java   |   1 -
 .../spelling/AbstractLuceneSpellChecker.java    |   5 +-
 .../spelling/ConjunctionSolrSpellChecker.java   |   3 +-
 .../solr/spelling/DirectSolrSpellChecker.java   |   3 +-
 .../solr/spelling/IndexBasedSpellChecker.java   |   3 +-
 .../solr/spelling/PossibilityIterator.java      |   3 +-
 .../apache/solr/spelling/QueryConverter.java    |   3 +-
 .../org/apache/solr/spelling/ResultEntry.java   |   3 +-
 .../apache/solr/spelling/SolrSpellChecker.java  |   3 +-
 .../solr/spelling/SpellCheckCollation.java      |   3 +-
 .../solr/spelling/SpellCheckCollator.java       |   3 +-
 .../solr/spelling/SpellCheckCorrection.java     |   3 +-
 .../apache/solr/spelling/SpellingOptions.java   |  17 +-
 .../solr/spelling/SpellingQueryConverter.java   |   1 -
 .../apache/solr/spelling/SpellingResult.java    |   3 +-
 .../solr/spelling/SuggestQueryConverter.java    |   3 +-
 .../spelling/WordBreakSolrSpellChecker.java     |   3 +-
 .../spelling/suggest/DictionaryFactory.java     |   3 +-
 .../suggest/DocumentDictionaryFactory.java      |   3 +-
 .../DocumentExpressionDictionaryFactory.java    |   3 +-
 .../spelling/suggest/FileDictionaryFactory.java |   3 +-
 .../suggest/HighFrequencyDictionaryFactory.java |   3 +-
 .../solr/spelling/suggest/LookupFactory.java    |   3 +-
 .../solr/spelling/suggest/SolrSuggester.java    |   3 +-
 .../apache/solr/spelling/suggest/Suggester.java |   1 -
 .../solr/spelling/suggest/SuggesterOptions.java |   3 +-
 .../solr/spelling/suggest/SuggesterParams.java  |   3 +-
 .../solr/spelling/suggest/SuggesterResult.java  |   3 +-
 .../fst/AnalyzingInfixLookupFactory.java        |   3 +-
 .../suggest/fst/AnalyzingLookupFactory.java     |   3 +-
 .../suggest/fst/BlendedInfixLookupFactory.java  |   3 +-
 .../spelling/suggest/fst/FSTLookupFactory.java  |   3 +-
 .../suggest/fst/FreeTextLookupFactory.java      |  23 +-
 .../suggest/fst/FuzzyLookupFactory.java         |   3 +-
 .../spelling/suggest/fst/WFSTLookupFactory.java |   3 +-
 .../suggest/jaspell/JaspellLookupFactory.java   |   7 +-
 .../spelling/suggest/tst/TSTLookupFactory.java  |   3 +-
 .../solr/store/blockcache/BlockCache.java       |   3 +-
 .../solr/store/blockcache/BlockCacheKey.java    |   4 +-
 .../store/blockcache/BlockCacheLocation.java    |   3 +-
 .../solr/store/blockcache/BlockDirectory.java   |   5 +-
 .../store/blockcache/BlockDirectoryCache.java   |   3 +-
 .../solr/store/blockcache/BlockLocks.java       |   3 +-
 .../solr/store/blockcache/BufferStore.java      |   3 +-
 .../org/apache/solr/store/blockcache/Cache.java |   3 +-
 .../store/blockcache/CachedIndexOutput.java     |   3 +-
 .../blockcache/CustomBufferedIndexInput.java    |   3 +-
 .../apache/solr/store/blockcache/Metrics.java   |   3 +-
 .../blockcache/ReusedBufferedIndexOutput.java   |   3 +-
 .../org/apache/solr/store/blockcache/Store.java |   3 +-
 .../apache/solr/store/hdfs/HdfsDirectory.java   |   3 +-
 .../apache/solr/store/hdfs/HdfsFileReader.java  |   3 +-
 .../apache/solr/store/hdfs/HdfsFileWriter.java  |   3 +-
 .../solr/store/hdfs/HdfsLocalityReporter.java   |   3 +-
 .../apache/solr/store/hdfs/HdfsLockFactory.java |   3 +-
 .../apache/solr/update/AddUpdateCommand.java    |   1 -
 .../apache/solr/update/CdcrTransactionLog.java  |   3 +-
 .../org/apache/solr/update/CdcrUpdateLog.java   |   3 +-
 .../org/apache/solr/update/CommitTracker.java   |   7 +-
 .../apache/solr/update/CommitUpdateCommand.java |   1 -
 .../solr/update/DefaultSolrCoreState.java       |   3 +-
 .../solr/update/DeleteByQueryWrapper.java       |   3 +-
 .../apache/solr/update/DeleteUpdateCommand.java |   1 -
 .../solr/update/DirectUpdateHandler2.java       |   1 -
 .../org/apache/solr/update/DocumentBuilder.java |   1 -
 .../apache/solr/update/HdfsTransactionLog.java  |  23 +-
 .../org/apache/solr/update/HdfsUpdateLog.java   |   1 -
 .../apache/solr/update/IndexFingerprint.java    | 200 ++++
 .../apache/solr/update/LoggingInfoStream.java   |   1 -
 .../org/apache/solr/update/MemOutputStream.java |   1 -
 .../apache/solr/update/MergeIndexesCommand.java |   1 -
 .../java/org/apache/solr/update/PeerSync.java   |  79 +-
 .../solr/update/RollbackUpdateCommand.java      |   1 -
 .../apache/solr/update/SolrCmdDistributor.java  |   3 +-
 .../org/apache/solr/update/SolrCoreState.java   |   3 +-
 .../org/apache/solr/update/SolrIndexConfig.java |   1 -
 .../apache/solr/update/SolrIndexSplitter.java   |   1 -
 .../org/apache/solr/update/SolrIndexWriter.java |   1 -
 .../apache/solr/update/SplitIndexCommand.java   |   1 -
 .../solr/update/StreamingSolrClients.java       |   3 +-
 .../org/apache/solr/update/TransactionLog.java  |   1 -
 .../org/apache/solr/update/UpdateCommand.java   |   1 -
 .../org/apache/solr/update/UpdateHandler.java   |   1 -
 .../java/org/apache/solr/update/UpdateLog.java  |   7 +-
 .../apache/solr/update/UpdateShardHandler.java  |   3 +-
 .../solr/update/UpdateShardHandlerConfig.java   |   3 +-
 .../org/apache/solr/update/VersionBucket.java   |   1 -
 .../org/apache/solr/update/VersionInfo.java     |   1 -
 ...tractDefaultValueUpdateProcessorFactory.java |   1 -
 .../AddSchemaFieldsUpdateProcessorFactory.java  |   1 -
 ...aluesOrNoneFieldMutatingUpdateProcessor.java |   1 -
 .../processor/AtomicUpdateDocumentMerger.java   |   7 +-
 .../update/processor/CdcrUpdateProcessor.java   |   3 +-
 .../processor/CdcrUpdateProcessorFactory.java   |   3 +-
 .../ConcatFieldUpdateProcessorFactory.java      |   1 -
 .../CountFieldValuesUpdateProcessorFactory.java |   1 -
 .../DefaultValueUpdateProcessorFactory.java     |   1 -
 .../processor/DistributedUpdateProcessor.java   |   7 +-
 .../DistributedUpdateProcessorFactory.java      |   3 +-
 .../DistributingUpdateProcessorFactory.java     |   1 -
 ...BasedVersionConstraintsProcessorFactory.java |   1 -
 .../DocExpirationUpdateProcessorFactory.java    |   1 -
 .../FieldLengthUpdateProcessorFactory.java      |   1 -
 .../processor/FieldMutatingUpdateProcessor.java |   1 -
 .../FieldMutatingUpdateProcessorFactory.java    |   1 -
 ...FieldNameMutatingUpdateProcessorFactory.java |   4 +-
 .../FieldValueMutatingUpdateProcessor.java      |   1 -
 .../FieldValueSubsetUpdateProcessorFactory.java |   1 -
 .../FirstFieldValueUpdateProcessorFactory.java  |   1 -
 .../HTMLStripFieldUpdateProcessorFactory.java   |   1 -
 ...oreCommitOptimizeUpdateProcessorFactory.java |   1 -
 .../IgnoreFieldUpdateProcessorFactory.java      |   1 -
 .../LastFieldValueUpdateProcessorFactory.java   |   1 -
 .../processor/LogUpdateProcessorFactory.java    |   1 -
 .../solr/update/processor/Lookup3Signature.java |   3 +-
 .../solr/update/processor/MD5Signature.java     |   3 +-
 .../MaxFieldValueUpdateProcessorFactory.java    |   1 -
 .../MinFieldValueUpdateProcessorFactory.java    |   1 -
 .../NoOpDistributingUpdateProcessorFactory.java |   1 -
 ...ParseBooleanFieldUpdateProcessorFactory.java |   1 -
 .../ParseDateFieldUpdateProcessorFactory.java   |   1 -
 .../ParseDoubleFieldUpdateProcessorFactory.java |   1 -
 .../ParseFloatFieldUpdateProcessorFactory.java  |   1 -
 .../ParseIntFieldUpdateProcessorFactory.java    |   1 -
 .../ParseLongFieldUpdateProcessorFactory.java   |   1 -
 ...ParseNumericFieldUpdateProcessorFactory.java |   1 -
 .../PreAnalyzedUpdateProcessorFactory.java      |  33 +-
 .../RemoveBlankFieldUpdateProcessorFactory.java |   1 -
 .../processor/RunUpdateProcessorFactory.java    |   1 -
 .../processor/ScriptEngineCustomizer.java       |   1 -
 .../apache/solr/update/processor/Signature.java |   3 +-
 .../SignatureUpdateProcessorFactory.java        |   3 +-
 .../processor/SimpleUpdateProcessorFactory.java |   3 +-
 .../StatelessScriptUpdateProcessorFactory.java  |   3 +-
 .../update/processor/TextProfileSignature.java  |   3 +-
 .../TimestampUpdateProcessorFactory.java        |   1 -
 .../TrimFieldUpdateProcessorFactory.java        |   1 -
 .../TruncateFieldUpdateProcessorFactory.java    |   1 -
 .../processor/UUIDUpdateProcessorFactory.java   |   1 -
 .../UniqFieldsUpdateProcessorFactory.java       |   3 +-
 .../processor/UpdateRequestProcessor.java       |   1 -
 .../processor/UpdateRequestProcessorChain.java  |   1 -
 .../UpdateRequestProcessorFactory.java          |   1 -
 .../apache/solr/util/AdjustableSemaphore.java   |   3 +-
 .../org/apache/solr/util/BoundedTreeSet.java    |   2 -
 .../org/apache/solr/util/CommandOperation.java  |   3 +-
 .../apache/solr/util/ConcurrentLFUCache.java    |   3 +-
 .../apache/solr/util/ConcurrentLRUCache.java    |   3 +-
 .../java/org/apache/solr/util/CryptoKeys.java   |   3 +-
 .../src/java/org/apache/solr/util/DOMUtil.java  |   3 +-
 .../org/apache/solr/util/DateFormatUtil.java    |   3 +-
 .../org/apache/solr/util/DateMathParser.java    |   1 -
 .../solr/util/DefaultSolrThreadFactory.java     |   3 +-
 .../org/apache/solr/util/DistanceUnits.java     |  19 +-
 .../java/org/apache/solr/util/FSHDFSUtils.java  |   3 +-
 .../java/org/apache/solr/util/FastWriter.java   |   3 +-
 .../java/org/apache/solr/util/FileUtils.java    |   3 +-
 .../src/java/org/apache/solr/util/HdfsUtil.java |  17 +-
 .../org/apache/solr/util/LongPriorityQueue.java |   7 +-
 .../java/org/apache/solr/util/MapListener.java  |   3 +-
 .../java/org/apache/solr/util/NumberUtils.java  |   1 -
 .../org/apache/solr/util/PivotListEntry.java    |   3 +-
 .../java/org/apache/solr/util/PrimUtils.java    |   3 +-
 .../apache/solr/util/PropertiesInputStream.java |   3 +-
 .../solr/util/PropertiesOutputStream.java       |   3 +-
 .../org/apache/solr/util/PropertiesUtil.java    |   3 +-
 .../src/java/org/apache/solr/util/RTimer.java   |   3 +-
 .../java/org/apache/solr/util/RTimerTree.java   |   3 +-
 .../apache/solr/util/RecordingJSONParser.java   |   4 +-
 .../java/org/apache/solr/util/RefCounted.java   |   1 -
 .../org/apache/solr/util/RegexFileFilter.java   |   3 +-
 .../org/apache/solr/util/SimplePostTool.java    |   3 +-
 .../src/java/org/apache/solr/util/SolrCLI.java  |   3 +-
 .../org/apache/solr/util/SolrLogLayout.java     |  33 +-
 .../org/apache/solr/util/SolrPluginUtils.java   |   1 -
 .../java/org/apache/solr/util/SpatialUtils.java |   3 +-
 .../org/apache/solr/util/SystemIdResolver.java  |   3 +-
 .../org/apache/solr/util/TestInjection.java     |   3 +-
 .../src/java/org/apache/solr/util/TimeOut.java  |   3 +-
 .../org/apache/solr/util/TimeZoneUtils.java     |   1 -
 .../org/apache/solr/util/VersionedFile.java     |   1 -
 .../hll/BigEndianAscendingWordDeserializer.java |   3 +-
 .../hll/BigEndianAscendingWordSerializer.java   |   3 +-
 .../java/org/apache/solr/util/hll/BitUtil.java  |   3 +-
 .../org/apache/solr/util/hll/BitVector.java     |   3 +-
 .../src/java/org/apache/solr/util/hll/HLL.java  |   3 +-
 .../org/apache/solr/util/hll/HLLMetadata.java   |   3 +-
 .../java/org/apache/solr/util/hll/HLLType.java  |   3 +-
 .../java/org/apache/solr/util/hll/HLLUtil.java  |   3 +-
 .../org/apache/solr/util/hll/IHLLMetadata.java  |   3 +-
 .../apache/solr/util/hll/ISchemaVersion.java    |   3 +-
 .../apache/solr/util/hll/IWordDeserializer.java |   3 +-
 .../apache/solr/util/hll/IWordSerializer.java   |   3 +-
 .../org/apache/solr/util/hll/LongIterator.java  |   3 +-
 .../org/apache/solr/util/hll/NumberUtil.java    |   3 +-
 .../apache/solr/util/hll/SchemaVersionOne.java  |   3 +-
 .../apache/solr/util/hll/SerializationUtil.java |   3 +-
 .../solr/util/plugin/AbstractPluginLoader.java  |   1 -
 .../solr/util/plugin/MapInitializedPlugin.java  |   1 -
 .../solr/util/plugin/MapPluginLoader.java       |   1 -
 .../util/plugin/NamedListInitializedPlugin.java |   1 -
 .../solr/util/plugin/NamedListPluginLoader.java |   1 -
 .../apache/solr/util/plugin/SolrCoreAware.java  |   1 -
 .../java/org/apache/solr/util/stats/Clock.java  |   1 -
 .../java/org/apache/solr/util/stats/EWMA.java   |   1 -
 .../util/stats/ExponentiallyDecayingSample.java |   1 -
 .../org/apache/solr/util/stats/Histogram.java   |   1 -
 .../java/org/apache/solr/util/stats/Meter.java  |   1 -
 .../java/org/apache/solr/util/stats/Sample.java |   1 -
 .../org/apache/solr/util/stats/Snapshot.java    |   1 -
 .../java/org/apache/solr/util/stats/Timer.java  |   1 -
 .../apache/solr/util/stats/TimerContext.java    |   1 -
 .../apache/solr/util/stats/UniformSample.java   |   1 -
 .../solr/util/xslt/TransformerProvider.java     |   1 -
 .../runtimecode/RuntimeLibReqHandler.java       |   4 +-
 .../runtimecode/RuntimeLibResponseWriter.java   |  18 +-
 .../runtimecode/RuntimeLibSearchComponent.java  |   4 +-
 .../solr/AnalysisAfterCoreReloadTest.java       |   3 +-
 .../org/apache/solr/BasicFunctionalityTest.java |   1 -
 .../org/apache/solr/ConvertedLegacyTest.java    |   1 -
 .../test/org/apache/solr/CursorPagingTest.java  |   1 -
 .../apache/solr/DisMaxRequestHandlerTest.java   |   1 -
 .../solr/DistributedIntervalFacetingTest.java   |  28 +-
 .../test/org/apache/solr/EchoParamsTest.java    |   1 -
 .../test/org/apache/solr/MinimalSchemaTest.java |   1 -
 .../test/org/apache/solr/OutputWriterTest.java  |   1 -
 .../src/test/org/apache/solr/SampleTest.java    |   1 -
 .../org/apache/solr/SolrTestCaseJ4Test.java     |   3 +-
 .../test/org/apache/solr/TestCrossCoreJoin.java |   1 -
 .../solr/TestCursorMarkWithoutUniqueKey.java    |   1 -
 .../apache/solr/TestDistributedGrouping.java    |   3 +-
 .../apache/solr/TestDistributedMissingSort.java |   1 -
 .../org/apache/solr/TestDistributedSearch.java  |   1 -
 .../org/apache/solr/TestDocumentBuilder.java    |   4 +-
 .../org/apache/solr/TestGroupingSearch.java     |   1 -
 .../apache/solr/TestHighlightDedupGrouping.java |   1 -
 .../core/src/test/org/apache/solr/TestJoin.java |   1 -
 .../org/apache/solr/TestRandomDVFaceting.java   |   1 -
 .../org/apache/solr/TestRandomFaceting.java     |   1 -
 .../solr/TestSimpleTrackingShardHandler.java    |   1 -
 .../org/apache/solr/TestTolerantSearch.java     |  33 +-
 .../PathHierarchyTokenizerFactoryTest.java      |   1 -
 .../apache/solr/analysis/TestCharFilters.java   |   3 +-
 .../TestReversedWildcardFilterFactory.java      |   3 +-
 .../TestWordDelimiterFilterFactory.java         |   3 +-
 .../ThrowingMockTokenFilterFactory.java         |   3 +-
 .../solr/client/solrj/ConnectionReuseTest.java  |   5 +-
 .../TestEmbeddedSolrServerConstructors.java     |   3 +-
 .../solrj/embedded/TestJettySolrRunner.java     |   3 +-
 .../apache/solr/cloud/ActionThrottleTest.java   |   3 +-
 .../apache/solr/cloud/AliasIntegrationTest.java |   3 +-
 .../test/org/apache/solr/cloud/AssignTest.java  |   3 +-
 .../AsyncCallRequestStatusResponseTest.java     |   3 +-
 .../solr/cloud/AsyncMigrateRouteKeyTest.java    |   3 +-
 .../solr/cloud/BaseCdcrDistributedZkTest.java   |   3 +-
 .../solr/cloud/BasicDistributedZk2Test.java     |   3 +-
 .../solr/cloud/BasicDistributedZkTest.java      |   3 +-
 .../test/org/apache/solr/cloud/BasicZkTest.java |   3 +-
 .../cloud/CdcrReplicationDistributedZkTest.java |   3 +-
 .../solr/cloud/CdcrReplicationHandlerTest.java  |   3 +-
 .../solr/cloud/CdcrRequestHandlerTest.java      |   3 +-
 .../solr/cloud/CdcrVersionReplicationTest.java  |   3 +-
 .../cloud/ChaosMonkeyNothingIsSafeTest.java     |   3 +-
 .../solr/cloud/ChaosMonkeySafeLeaderTest.java   |   3 +-
 .../solr/cloud/ChaosMonkeyShardSplitTest.java   |   3 +-
 .../apache/solr/cloud/CleanupOldIndexTest.java  |   3 +-
 .../cloud/CloudExitableDirectoryReaderTest.java |  34 +-
 .../org/apache/solr/cloud/ClusterStateTest.java |  27 +-
 .../solr/cloud/ClusterStateUpdateTest.java      |   3 +-
 .../apache/solr/cloud/CollectionReloadTest.java |   3 +-
 .../solr/cloud/CollectionStateFormat2Test.java  |   3 +-
 .../cloud/CollectionTooManyReplicasTest.java    |   3 +-
 .../CollectionsAPIAsyncDistributedZkTest.java   |   3 +-
 .../cloud/CollectionsAPIDistributedZkTest.java  |   3 +-
 .../solr/cloud/CollectionsAPISolrJTests.java    |   3 +-
 ...ConcurrentDeleteAndCreateCollectionTest.java |   3 +-
 .../apache/solr/cloud/ConfigSetsAPITest.java    |   3 +-
 .../solr/cloud/ConnectionManagerTest.java       |  27 +-
 .../apache/solr/cloud/CustomCollectionTest.java |   3 +-
 .../solr/cloud/DeleteInactiveReplicaTest.java   |   3 +-
 .../DeleteLastCustomShardedReplicaTest.java     |   3 +-
 .../apache/solr/cloud/DeleteReplicaTest.java    |   3 +-
 .../org/apache/solr/cloud/DeleteShardTest.java  |   3 +-
 .../cloud/DistribJoinFromCollectionTest.java    |   3 +-
 .../apache/solr/cloud/DistributedQueueTest.java |  22 +-
 .../solr/cloud/DistributedVersionInfoTest.java  |   3 +-
 .../org/apache/solr/cloud/ForceLeaderTest.java  |   3 +-
 .../cloud/FullSolrCloudDistribCmdsTest.java     |   3 +-
 .../apache/solr/cloud/HttpPartitionTest.java    |   3 +-
 .../org/apache/solr/cloud/KerberosTestUtil.java |  29 +-
 .../cloud/LeaderElectionIntegrationTest.java    |   3 +-
 .../apache/solr/cloud/LeaderElectionTest.java   |  28 +-
 .../cloud/LeaderFailoverAfterPartitionTest.java |   3 +-
 .../LeaderInitiatedRecoveryOnCommitTest.java    |   3 +-
 ...aderInitiatedRecoveryOnShardRestartTest.java |   3 +-
 .../apache/solr/cloud/MigrateRouteKeyTest.java  |   3 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java |   3 +-
 ...utOfBoxZkACLAndCredentialsProvidersTest.java |  33 +-
 ...rriddenZkACLAndCredentialsProvidersTest.java |  33 +-
 ...verseerCollectionConfigSetProcessorTest.java |   3 +-
 .../apache/solr/cloud/OverseerRolesTest.java    |   4 +-
 .../apache/solr/cloud/OverseerStatusTest.java   |   3 +-
 .../solr/cloud/OverseerTaskQueueTest.java       |  22 +-
 .../org/apache/solr/cloud/OverseerTest.java     |   3 +-
 .../solr/cloud/RecoveryAfterSoftCommitTest.java |   3 +-
 .../org/apache/solr/cloud/RecoveryZkTest.java   |   3 +-
 .../apache/solr/cloud/RemoteQueryErrorTest.java |   3 +-
 .../solr/cloud/ReplicaPropertiesBase.java       |   3 +-
 .../solr/cloud/ReplicationFactorTest.java       |   3 +-
 .../solr/cloud/RestartWhileUpdatingTest.java    |   3 +-
 .../apache/solr/cloud/RollingRestartTest.java   |   3 +-
 .../org/apache/solr/cloud/SSLMigrationTest.java |   3 +-
 .../solr/cloud/SaslZkACLProviderTest.java       |  33 +-
 .../solr/cloud/ShardRoutingCustomTest.java      |   3 +-
 .../org/apache/solr/cloud/ShardRoutingTest.java |   3 +-
 .../org/apache/solr/cloud/ShardSplitTest.java   |   3 +-
 .../cloud/SharedFSAutoReplicaFailoverTest.java  |   3 +-
 .../SharedFSAutoReplicaFailoverUtilsTest.java   |   3 +-
 .../cloud/SimpleCollectionCreateDeleteTest.java |   3 +-
 .../org/apache/solr/cloud/SliceStateTest.java   |  27 +-
 .../apache/solr/cloud/SolrCloudExampleTest.java |   3 +-
 .../org/apache/solr/cloud/SolrXmlInZkTest.java  |  22 +-
 .../org/apache/solr/cloud/SyncSliceTest.java    |   3 +-
 .../solr/cloud/TestAuthenticationFramework.java |   3 +-
 .../apache/solr/cloud/TestCloudInspectUtil.java |   7 +-
 .../apache/solr/cloud/TestCollectionAPI.java    |   4 +-
 .../apache/solr/cloud/TestConfigSetsAPI.java    |   1 -
 .../cloud/TestConfigSetsAPIExclusivity.java     |   1 -
 .../solr/cloud/TestConfigSetsAPIZkFailure.java  |   1 -
 .../org/apache/solr/cloud/TestCryptoKeys.java   |   3 +-
 .../solr/cloud/TestDistribDocBasedVersion.java  |   3 +-
 .../solr/cloud/TestDownShardTolerantSearch.java |   3 +-
 .../TestExclusionRuleCollectionAccess.java      |   3 +-
 .../apache/solr/cloud/TestHashPartitioner.java  |  27 +-
 .../solr/cloud/TestLeaderElectionZkExpiry.java  |   3 +-
 .../TestLeaderInitiatedRecoveryThread.java      |  31 +-
 .../solr/cloud/TestMiniSolrCloudCluster.java    |   3 +-
 .../cloud/TestMiniSolrCloudClusterBase.java     |   4 +-
 .../cloud/TestMiniSolrCloudClusterKerberos.java |   3 +-
 .../solr/cloud/TestMiniSolrCloudClusterSSL.java |   3 +-
 .../cloud/TestRandomRequestDistribution.java    |   3 +-
 .../apache/solr/cloud/TestRebalanceLeaders.java |   3 +-
 .../solr/cloud/TestReplicaProperties.java       |   4 +-
 .../solr/cloud/TestRequestForwarding.java       |   3 +-
 .../cloud/TestRequestStatusCollectionAPI.java   |   3 +-
 .../solr/cloud/TestShortCircuitedRequests.java  |   3 +-
 .../cloud/TestSolrCloudWithKerberosAlt.java     |   3 +-
 .../org/apache/solr/cloud/TestZkChroot.java     |   3 +-
 .../TlogReplayBufferedWhileIndexingTest.java    | 136 +++
 .../cloud/TriLevelCompositeIdRoutingTest.java   |   3 +-
 .../solr/cloud/UnloadDistributedZkTest.java     |   3 +-
 ...MParamsZkACLAndCredentialsProvidersTest.java |  33 +-
 .../test/org/apache/solr/cloud/ZkCLITest.java   |   3 +-
 .../org/apache/solr/cloud/ZkControllerTest.java |  28 +-
 .../org/apache/solr/cloud/ZkNodePropsTest.java  |  27 +-
 .../org/apache/solr/cloud/ZkSolrClientTest.java |  27 +-
 .../cloud/hdfs/HdfsBasicDistributedZk2Test.java |   3 +-
 .../cloud/hdfs/HdfsBasicDistributedZkTest.java  |   3 +-
 .../hdfs/HdfsChaosMonkeyNothingIsSafeTest.java  |   3 +-
 .../hdfs/HdfsChaosMonkeySafeLeaderTest.java     |   3 +-
 .../HdfsCollectionsAPIDistributedZkTest.java    |   3 +-
 .../solr/cloud/hdfs/HdfsNNFailoverTest.java     |   1 -
 .../solr/cloud/hdfs/HdfsRecoverLeaseTest.java   |   3 +-
 .../solr/cloud/hdfs/HdfsRecoveryZkTest.java     |   3 +-
 .../hdfs/HdfsRestartWhileUpdatingTest.java      |   3 +-
 .../solr/cloud/hdfs/HdfsSyncSliceTest.java      |   3 +-
 .../apache/solr/cloud/hdfs/HdfsTestUtil.java    |  33 +-
 .../solr/cloud/hdfs/HdfsThreadLeakTest.java     |   3 +-
 ...HdfsTlogReplayBufferedWhileIndexingTest.java |  63 ++
 .../cloud/hdfs/HdfsUnloadDistributedZkTest.java |   3 +-
 .../HdfsWriteToMultipleCollectionsTest.java     |   1 -
 .../apache/solr/cloud/hdfs/StressHdfsTest.java  |   1 -
 .../cloud/overseer/TestClusterStateMutator.java |   3 +-
 .../solr/cloud/overseer/ZkStateReaderTest.java  |   3 +-
 .../solr/cloud/overseer/ZkStateWriterTest.java  |   3 +-
 .../apache/solr/cloud/rule/RuleEngineTest.java  |   3 +-
 .../org/apache/solr/cloud/rule/RulesTest.java   |   7 +-
 .../solr/core/BlobStoreTestRequestHandler.java  |   4 +-
 .../solr/core/CachingDirectoryFactoryTest.java  |  33 +-
 .../solr/core/CountUsageValueSourceParser.java  |   3 +-
 .../apache/solr/core/DirectoryFactoryTest.java  |   1 -
 .../solr/core/DummyValueSourceParser.java       |   3 +-
 .../solr/core/ExitableDirectoryReaderTest.java  |   4 +-
 .../solr/core/HdfsDirectoryFactoryTest.java     |   1 -
 .../org/apache/solr/core/MockInfoMBean.java     |  13 +-
 .../solr/core/MockShardHandlerFactory.java      |   3 +-
 .../solr/core/OpenCloseCoreStressTest.java      |   1 -
 .../org/apache/solr/core/PluginInfoTest.java    |   3 +-
 .../apache/solr/core/QueryResultKeyTest.java    |   1 -
 .../solr/core/RAMDirectoryFactoryTest.java      |   1 -
 .../apache/solr/core/RequestHandlersTest.java   |   1 -
 .../apache/solr/core/ResourceLoaderTest.java    |   1 -
 .../test/org/apache/solr/core/SOLR749Test.java  |   3 +-
 .../core/SolrCoreCheckLockOnStartupTest.java    |   3 +-
 .../test/org/apache/solr/core/SolrCoreTest.java |   1 -
 .../org/apache/solr/core/TestBadConfig.java     |   1 -
 .../org/apache/solr/core/TestCodecSupport.java  |   3 +-
 .../test/org/apache/solr/core/TestConfig.java   |   1 -
 .../org/apache/solr/core/TestConfigOverlay.java |   3 +-
 .../solr/core/TestConfigSetImmutable.java       |   3 +-
 .../solr/core/TestConfigSetProperties.java      |   3 +-
 .../org/apache/solr/core/TestConfigSets.java    |   3 +-
 .../org/apache/solr/core/TestCoreContainer.java |   1 -
 .../org/apache/solr/core/TestCoreDiscovery.java |   3 +-
 .../apache/solr/core/TestDynamicLoading.java    |   4 +-
 .../solr/core/TestImplicitCoreProperties.java   |  32 +-
 .../apache/solr/core/TestInfoStreamLogging.java |   3 +-
 .../org/apache/solr/core/TestInitParams.java    |   3 +-
 .../org/apache/solr/core/TestLazyCores.java     |   3 +-
 .../apache/solr/core/TestMergePolicyConfig.java |   3 +-
 .../test/org/apache/solr/core/TestNRTOpen.java  |   3 +-
 .../solr/core/TestQuerySenderListener.java      |   1 -
 .../solr/core/TestQuerySenderNoQuery.java       |   3 +-
 .../solr/core/TestReloadAndDeleteDocs.java      |   1 -
 .../solr/core/TestShardHandlerFactory.java      |   1 -
 .../apache/solr/core/TestSolrConfigHandler.java |   4 +-
 .../apache/solr/core/TestSolrIndexConfig.java   |   3 +-
 .../test/org/apache/solr/core/TestSolrXml.java  |   3 +-
 .../apache/solr/core/TestXIncludeConfig.java    |   3 +-
 .../handler/AnalysisRequestHandlerTestBase.java |   1 -
 .../solr/handler/CSVRequestHandlerTest.java     |   1 -
 .../apache/solr/handler/CheckBackupStatus.java  |   3 +-
 .../DocumentAnalysisRequestHandlerTest.java     |   1 -
 .../FieldAnalysisRequestHandlerTest.java        |   1 -
 .../org/apache/solr/handler/JsonLoaderTest.java |   1 -
 .../solr/handler/MoreLikeThisHandlerTest.java   |   1 -
 .../solr/handler/PingRequestHandlerTest.java    |   1 -
 .../apache/solr/handler/RequestLoggingTest.java |   3 +-
 .../handler/StandardRequestHandlerTest.java     |   1 -
 .../apache/solr/handler/TestBlobHandler.java    |   3 +-
 .../org/apache/solr/handler/TestCSVLoader.java  |   1 -
 .../apache/solr/handler/TestConfigReload.java   |   3 +-
 .../handler/TestReplicationHandlerBackup.java   |   3 +-
 .../apache/solr/handler/TestReqParamsAPI.java   |  33 +-
 .../apache/solr/handler/TestRestoreCore.java    |   4 +-
 .../org/apache/solr/handler/TestSQLHandler.java |   6 +-
 .../handler/TestSolrConfigHandlerCloud.java     |   4 +-
 .../TestSolrConfigHandlerConcurrent.java        |   3 +-
 .../handler/ThrowErrorOnInitRequestHandler.java |   1 -
 .../admin/CoreAdminCreateDiscoverTest.java      |   1 -
 .../handler/admin/CoreAdminHandlerTest.java     |  62 +-
 .../admin/CoreAdminRequestStatusTest.java       |   3 +-
 .../admin/CoreMergeIndexesAdminHandlerTest.java |   3 +-
 .../solr/handler/admin/InfoHandlerTest.java     |   1 -
 .../solr/handler/admin/LoggingHandlerTest.java  |   1 -
 .../handler/admin/LukeRequestHandlerTest.java   |   1 -
 .../solr/handler/admin/MBeansHandlerTest.java   |   1 -
 .../handler/admin/SecurityConfHandlerTest.java  |   4 +-
 .../admin/SegmentsInfoRequestHandlerTest.java   |   3 +-
 .../admin/ShowFileRequestHandlerTest.java       |   3 +-
 .../handler/admin/SystemInfoHandlerTest.java    |   1 -
 .../handler/component/BadComponentTest.java     |   5 +-
 .../handler/component/DebugComponentTest.java   |   3 +-
 .../DistributedDebugComponentTest.java          |  33 +-
 .../DistributedExpandComponentTest.java         |   3 +-
 .../DistributedFacetPivotLargeTest.java         |   3 +-
 .../DistributedFacetPivotLongTailTest.java      |   3 +-
 .../DistributedFacetPivotSmallAdvancedTest.java |   3 +-
 .../DistributedFacetPivotSmallTest.java         |   3 +-
 .../DistributedFacetPivotWhiteBoxTest.java      |   3 +-
 .../component/DistributedMLTComponentTest.java  |   3 +-
 ...DistributedQueryComponentCustomSortTest.java |   3 +-
 ...stributedQueryComponentOptimizationTest.java |   3 +-
 .../DistributedQueryElevationComponentTest.java |   3 +-
 .../DistributedSpellCheckComponentTest.java     |   3 +-
 .../DistributedSuggestComponentTest.java        |   3 +-
 .../DistributedTermsComponentTest.java          |   3 +-
 .../component/DummyCustomParamSpellChecker.java |  26 +-
 .../handler/component/FacetPivotSmallTest.java  |   3 +-
 .../component/QueryElevationComponentTest.java  |   1 -
 .../component/ResponseLogComponentTest.java     |  17 +-
 .../handler/component/SearchHandlerTest.java    |   1 -
 .../component/SpatialHeatmapFacetsTest.java     |   3 +-
 .../component/SpellCheckComponentTest.java      |   1 -
 .../handler/component/StatsComponentTest.java   |   3 +-
 .../SuggestComponentContextFilterQueryTest.java |   3 +-
 .../handler/component/SuggestComponentTest.java |   3 +-
 .../TermVectorComponentDistributedTest.java     |   1 -
 .../component/TermVectorComponentTest.java      |  18 +-
 .../handler/component/TermsComponentTest.java   |   3 +-
 ...estDistributedStatsComponentCardinality.java |   7 +-
 .../handler/component/TestExpandComponent.java  |  31 +-
 .../handler/component/TestPivotHelperCode.java  |   5 +-
 .../TestTrackingShardHandlerFactory.java        |   3 +-
 .../solr/handler/loader/JavabinLoaderTest.java  |   3 +-
 .../highlight/FastVectorHighlighterTest.java    |   1 -
 .../highlight/HighlighterMaxOffsetTest.java     |   3 +-
 .../apache/solr/highlight/HighlighterTest.java  |   1 -
 .../highlight/TestPostingsSolrHighlighter.java  |   3 +-
 .../solr/index/hdfs/CheckHdfsIndexTest.java     |   3 +-
 .../apache/solr/internal/csv/CSVParserTest.java |   6 +-
 .../solr/internal/csv/CSVPrinterTest.java       |   6 +-
 .../solr/internal/csv/CSVStrategyTest.java      |   6 +-
 .../apache/solr/internal/csv/CSVUtilsTest.java  |   6 +-
 .../solr/internal/csv/CharBufferTest.java       |  26 +-
 .../csv/ExtendedBufferedReaderTest.java         |   6 +-
 .../csv/writer/CSVConfigGuesserTest.java        |  26 +-
 .../solr/internal/csv/writer/CSVConfigTest.java |  26 +-
 .../solr/internal/csv/writer/CSVFieldTest.java  |  26 +-
 .../solr/internal/csv/writer/CSVWriterTest.java |  26 +-
 .../org/apache/solr/logging/TestLogWatcher.java |   3 +-
 .../org/apache/solr/request/JSONWriterTest.java |   1 -
 .../apache/solr/request/SimpleFacetsTest.java   |   1 -
 .../apache/solr/request/SmileWriterTest.java    |   4 +-
 .../org/apache/solr/request/TestFaceting.java   |   1 -
 .../solr/request/TestIntervalFaceting.java      |   1 -
 .../solr/request/TestRemoteStreaming.java       |   3 +-
 .../org/apache/solr/request/TestWriterPerf.java |   1 -
 .../apache/solr/request/macro/TestMacros.java   |   4 +-
 .../solr/response/TestCSVResponseWriter.java    |   1 -
 .../solr/response/TestChildDocTransformer.java  |   3 +-
 .../solr/response/TestCustomDocTransformer.java |   3 +-
 .../TestPHPSerializedResponseWriter.java        |   1 -
 .../solr/response/TestRawResponseWriter.java    |   1 -
 .../solr/response/TestRawTransformer.java       |   3 +-
 .../solr/response/TestSolrQueryResponse.java    |   3 +-
 .../response/TestSortingResponseWriter.java     |   6 +-
 .../apache/solr/rest/SolrRestletTestBase.java   |   3 +-
 .../apache/solr/rest/TestManagedResource.java   |   3 +-
 .../solr/rest/TestManagedResourceStorage.java   |   3 +-
 .../org/apache/solr/rest/TestRestManager.java   |   3 +-
 .../solr/rest/schema/TestBulkSchemaAPI.java     |  86 +-
 .../rest/schema/TestClassNameShortening.java    |   3 +-
 .../schema/TestCopyFieldCollectionResource.java |   3 +-
 .../schema/TestDefaultSearchFieldResource.java  |   3 +-
 .../TestDynamicFieldCollectionResource.java     |   3 +-
 .../rest/schema/TestDynamicFieldResource.java   |   3 +-
 .../schema/TestFieldCollectionResource.java     |   3 +-
 .../solr/rest/schema/TestFieldResource.java     |   3 +-
 .../schema/TestFieldTypeCollectionResource.java |   3 +-
 .../solr/rest/schema/TestFieldTypeResource.java |   4 +-
 .../TestManagedSchemaDynamicFieldResource.java  |   3 +-
 .../schema/TestManagedSchemaFieldResource.java  |   3 +-
 .../TestManagedSchemaFieldTypeResource.java     |   3 +-
 .../schema/TestRemoveLastDynamicCopyField.java  |   4 +-
 .../rest/schema/TestSchemaNameResource.java     |   3 +-
 .../solr/rest/schema/TestSchemaResource.java    |   4 +-
 .../schema/TestSchemaSimilarityResource.java    |   3 +-
 .../rest/schema/TestSchemaVersionResource.java  |   3 +-
 .../TestSerializedLuceneMatchVersion.java       |   3 +-
 ...tSolrQueryParserDefaultOperatorResource.java |   3 +-
 .../schema/TestSolrQueryParserResource.java     |   3 +-
 .../rest/schema/TestUniqueKeyFieldResource.java |   3 +-
 .../analysis/TestManagedStopFilterFactory.java  |   3 +-
 .../TestManagedSynonymFilterFactory.java        |   3 +-
 .../solr/schema/AbstractCurrencyFieldTest.java  |   3 +-
 .../apache/solr/schema/BadCopyFieldTest.java    |   1 -
 .../apache/solr/schema/BadIndexSchemaTest.java  |   1 -
 .../solr/schema/ChangedSchemaMergeTest.java     |   1 -
 .../org/apache/solr/schema/CopyFieldTest.java   |   1 -
 .../schema/CurrencyFieldOpenExchangeTest.java   |   3 +-
 .../solr/schema/CurrencyFieldXmlFileTest.java   |   3 +-
 .../solr/schema/CustomAnalyzerStrField.java     |   3 +-
 .../org/apache/solr/schema/DateFieldTest.java   |   1 -
 .../apache/solr/schema/DateRangeFieldTest.java  |   5 +-
 .../solr/schema/DocValuesMissingTest.java       |   3 +-
 .../apache/solr/schema/DocValuesMultiTest.java  |   3 +-
 .../org/apache/solr/schema/DocValuesTest.java   |   3 +-
 .../org/apache/solr/schema/EnumFieldTest.java   |   3 +-
 .../solr/schema/ExternalFileFieldSortTest.java  |  19 +-
 .../schema/IndexSchemaRuntimeFieldTest.java     |   3 +-
 .../org/apache/solr/schema/IndexSchemaTest.java |   1 -
 .../solr/schema/MockExchangeRateProvider.java   |   3 +-
 .../org/apache/solr/schema/MultiTermTest.java   |   3 +-
 .../apache/solr/schema/MyCrazyCustomField.java  |   3 +-
 .../solr/schema/NotRequiredUniqueKeyTest.java   |   1 -
 .../apache/solr/schema/NumericFieldsTest.java   |   1 -
 .../OpenExchangeRatesOrgProviderTest.java       |   3 +-
 .../org/apache/solr/schema/PolyFieldTest.java   |   3 +-
 .../solr/schema/PreAnalyzedFieldTest.java       |   3 +-
 .../solr/schema/PrimitiveFieldTypeTest.java     |   1 -
 .../apache/solr/schema/RequiredFieldsTest.java  |   1 -
 .../SchemaVersionSpecificBehaviorTest.java      |   1 -
 .../apache/solr/schema/SortableBinaryField.java |   3 +-
 .../solr/schema/SpatialRPTFieldTypeTest.java    |   3 +-
 .../solr/schema/SynonymTokenizerTest.java       |   3 +-
 .../org/apache/solr/schema/TestBinaryField.java |   1 -
 .../solr/schema/TestBulkSchemaConcurrent.java   |   4 +-
 .../solr/schema/TestCloudManagedSchema.java     |   3 +-
 .../TestCloudManagedSchemaConcurrent.java       |   3 +-
 .../apache/solr/schema/TestCloudSchemaless.java |   3 +-
 .../apache/solr/schema/TestCollationField.java  |   1 -
 .../schema/TestCollationFieldDocValues.java     |   1 -
 .../apache/solr/schema/TestManagedSchema.java   |   3 +-
 .../apache/solr/schema/TestOmitPositions.java   |   3 +-
 .../apache/solr/schema/TestSchemaManager.java   |   3 +-
 .../solr/schema/TestUseDocValuesAsStored.java   |   3 +-
 .../solr/schema/TestUseDocValuesAsStored2.java  |   3 +-
 .../solr/schema/ThrowErrorOnInitFieldType.java  |   3 +-
 .../TrieIntPrefixActsAsRangeQueryFieldType.java |   3 +-
 .../org/apache/solr/schema/WrappedIntField.java |   3 +-
 .../solr/search/AnalyticsMergeStrategyTest.java |   3 +-
 .../apache/solr/search/AnalyticsQueryTest.java  |   1 -
 .../org/apache/solr/search/CursorMarkTest.java  |   1 -
 .../solr/search/DelayingSearchComponent.java    |   3 +-
 .../test/org/apache/solr/search/DocSetPerf.java |   1 -
 .../apache/solr/search/FooQParserPlugin.java    |   5 -
 .../apache/solr/search/MergeStrategyTest.java   |   3 +-
 .../apache/solr/search/MockSearchComponent.java |   3 +-
 .../apache/solr/search/QueryEqualityTest.java   |  16 +-
 .../apache/solr/search/QueryParsingTest.java    |   3 +-
 .../org/apache/solr/search/RankQueryTest.java   |   1 -
 .../apache/solr/search/ReturnFieldsTest.java    |   1 -
 .../apache/solr/search/SortSpecParsingTest.java |   3 +-
 .../apache/solr/search/SpatialFilterTest.java   |   4 +-
 .../solr/search/TestAddFieldRealTimeGet.java    |   3 +-
 .../solr/search/TestAnalyticsQParserPlugin.java |   5 -
 .../solr/search/TestCollapseQParserPlugin.java  |   1 -
 .../search/TestComplexPhraseQParserPlugin.java  |   3 +-
 .../apache/solr/search/TestComponentsName.java  |   3 +-
 .../org/apache/solr/search/TestCustomSort.java  |   3 +-
 .../test/org/apache/solr/search/TestDocSet.java |   1 -
 .../solr/search/TestElisionMultitermQuery.java  |  11 +-
 .../solr/search/TestExtendedDismaxParser.java   |   1 -
 .../apache/solr/search/TestFieldSortValues.java |   3 +-
 .../solr/search/TestFilteredDocIdSet.java       |   3 +-
 .../org/apache/solr/search/TestFiltering.java   |   1 -
 .../solr/search/TestFoldingMultitermQuery.java  |   3 +-
 .../solr/search/TestHashQParserPlugin.java      |   1 -
 .../org/apache/solr/search/TestInitQParser.java |   3 +-
 .../org/apache/solr/search/TestLFUCache.java    |   3 +-
 .../org/apache/solr/search/TestLRUCache.java    |   3 +-
 .../solr/search/TestMaxScoreQueryParser.java    |   3 +-
 .../apache/solr/search/TestMissingGroups.java   |   1 -
 .../apache/solr/search/TestNoOpRegenerator.java |   3 +-
 ...OverriddenPrefixQueryForCustomFieldType.java |   3 +-
 .../solr/search/TestPseudoReturnFields.java     |   1 -
 .../org/apache/solr/search/TestQueryUtils.java  |   1 -
 .../solr/search/TestQueryWrapperFilter.java     |   4 +-
 .../search/TestRandomCollapseQParserPlugin.java |   1 -
 .../apache/solr/search/TestRankQueryPlugin.java |   5 -
 .../solr/search/TestReRankQParserPlugin.java    |  64 +-
 .../apache/solr/search/TestReloadDeadlock.java  |   5 +-
 .../org/apache/solr/search/TestSearchPerf.java  |   1 -
 .../solr/search/TestSimpleQParserPlugin.java    |   3 +-
 .../apache/solr/search/TestSmileRequest.java    |   4 +-
 .../apache/solr/search/TestSolr4Spatial.java    |   3 +-
 .../apache/solr/search/TestSolr4Spatial2.java   |   3 +-
 .../test/org/apache/solr/search/TestSolrJ.java  |   1 -
 .../apache/solr/search/TestSolrQueryParser.java | 231 ++---
 .../test/org/apache/solr/search/TestSort.java   |   1 -
 .../solr/search/TestStandardQParsers.java       |   3 +-
 .../solr/search/TestStressUserVersions.java     |   5 +-
 .../solr/search/TestSurroundQueryParser.java    |   3 +-
 .../org/apache/solr/search/TestTrieFacet.java   |   1 -
 .../solr/search/TestValueSourceCache.java       |   3 +-
 .../org/apache/solr/search/TestXmlQParser.java  |   5 +-
 .../solr/search/facet/TestJsonFacets.java       |  25 +-
 .../search/function/NvlValueSourceParser.java   |   1 -
 .../search/function/SortByFunctionTest.java     |   3 +-
 .../solr/search/function/TestFunctionQuery.java |   1 -
 .../function/TestMinMaxOnMultiValuedField.java  |   1 -
 .../solr/search/function/TestOrdValues.java     |   3 +-
 .../function/TestSortByMinMaxFunction.java      |   3 +-
 .../function/distance/DistanceFunctionTest.java |   3 +-
 .../apache/solr/search/join/BJQParserTest.java  |   1 -
 .../search/join/BlockJoinFacetDistribTest.java  |   3 +-
 .../search/join/BlockJoinFacetRandomTest.java   |   3 +-
 .../search/join/BlockJoinFacetSimpleTest.java   |   3 +-
 .../apache/solr/search/join/GraphQueryTest.java |  26 +-
 .../search/join/TestScoreJoinQPNoScore.java     |   1 -
 .../solr/search/join/TestScoreJoinQPScore.java  |   1 -
 .../solr/search/json/TestJsonRequest.java       |   3 +-
 .../solr/search/mlt/CloudMLTQParserTest.java    |   3 +-
 .../solr/search/mlt/SimpleMLTQParserTest.java   |   3 +-
 .../similarities/BaseSimilarityTestCase.java    |   3 +-
 .../similarities/TestBM25SimilarityFactory.java |   3 +-
 .../TestClassicSimilarityFactory.java           |   3 +-
 .../similarities/TestDFISimilarityFactory.java  |   3 +-
 .../similarities/TestDFRSimilarityFactory.java  |   3 +-
 .../similarities/TestIBSimilarityFactory.java   |   3 +-
 .../TestLMDirichletSimilarityFactory.java       |   3 +-
 .../TestLMJelinekMercerSimilarityFactory.java   |   3 +-
 .../TestNonDefinedSimilarityFactory.java        |   3 +-
 .../similarities/TestPerFieldSimilarity.java    |   3 +-
 .../TestPerFieldSimilarityClassic.java          |   3 +-
 ...stPerFieldSimilarityWithDefaultOverride.java |   3 +-
 .../TestSweetSpotSimilarityFactory.java         |   3 +-
 .../solr/search/stats/TestBaseStatsCache.java   |   3 +-
 .../search/stats/TestDefaultStatsCache.java     |   3 +-
 .../solr/search/stats/TestDistribIDF.java       |   3 +-
 .../search/stats/TestExactSharedStatsCache.java |   4 +-
 .../solr/search/stats/TestExactStatsCache.java  |   4 +-
 .../solr/search/stats/TestLRUStatsCache.java    |   4 +-
 .../solr/security/BasicAuthIntegrationTest.java |  66 +-
 .../solr/security/MockAuthenticationPlugin.java |   4 +-
 .../solr/security/MockAuthorizationPlugin.java  |   3 +-
 .../PKIAuthenticationIntegrationTest.java       |   4 +-
 .../security/TestAuthorizationFramework.java    |   7 +-
 .../security/TestPKIAuthenticationPlugin.java   |   3 +-
 .../TestRuleBasedAuthorizationPlugin.java       |   3 +-
 .../TestSha256AuthenticationProvider.java       |   3 +-
 .../solr/servlet/DirectSolrConnectionTest.java  |   1 -
 .../apache/solr/servlet/ResponseHeaderTest.java |   3 +-
 .../solr/servlet/SolrRequestParserTest.java     |   1 -
 .../ConjunctionSolrSpellCheckerTest.java        |  23 +-
 .../spelling/DirectSolrSpellCheckerTest.java    |   3 +-
 .../spelling/FileBasedSpellCheckerTest.java     |   1 -
 .../apache/solr/spelling/SampleComparator.java  |   3 +-
 .../solr/spelling/SpellCheckCollatorTest.java   |   3 +-
 .../spelling/SpellPossibilityIteratorTest.java  |   3 +-
 .../spelling/SpellingQueryConverterTest.java    |   1 -
 .../spelling/TestSuggestSpellingConverter.java  |   3 +-
 .../spelling/WordBreakSolrSpellCheckerTest.java |   3 +-
 .../solr/spelling/suggest/SuggesterFSTTest.java |   3 +-
 .../solr/spelling/suggest/SuggesterTSTTest.java |   3 +-
 .../solr/spelling/suggest/SuggesterTest.java    |   1 -
 .../spelling/suggest/SuggesterWFSTTest.java     |   3 +-
 .../suggest/TestAnalyzeInfixSuggestions.java    |  11 +-
 .../suggest/TestAnalyzedSuggestions.java        |   3 +-
 .../suggest/TestBlendedInfixSuggestions.java    |   3 +-
 .../suggest/TestFileDictionaryLookup.java       |   3 +-
 .../suggest/TestFreeTextSuggestions.java        |   3 +-
 .../suggest/TestFuzzyAnalyzedSuggestions.java   |  11 +-
 .../TestHighFrequencyDictionaryFactory.java     |   3 +-
 .../spelling/suggest/TestPhraseSuggestions.java |   3 +-
 .../solr/store/blockcache/BlockCacheTest.java   |   3 +-
 .../store/blockcache/BlockDirectoryTest.java    |   3 +-
 .../solr/store/blockcache/BufferStoreTest.java  |   3 +-
 .../solr/store/hdfs/HdfsDirectoryTest.java      |   3 +-
 .../solr/store/hdfs/HdfsLockFactoryTest.java    |   3 +-
 .../apache/solr/update/AddBlockUpdateTest.java  |  25 +-
 .../solr/update/AnalysisErrorHandlingTest.java  |   3 +-
 .../org/apache/solr/update/AutoCommitTest.java  |   1 -
 .../apache/solr/update/CdcrUpdateLogTest.java   |   3 +-
 .../solr/update/DataDrivenBlockJoinTest.java    |  23 +-
 .../update/DirectUpdateHandlerOptimizeTest.java |   3 +-
 .../solr/update/DirectUpdateHandlerTest.java    |   1 -
 .../apache/solr/update/DocumentBuilderTest.java |   1 -
 .../apache/solr/update/DummyMergePolicy.java    |   3 +-
 .../apache/solr/update/HardAutoCommitTest.java  |   1 -
 .../solr/update/MockStreamingSolrClients.java   |   3 +-
 .../org/apache/solr/update/PeerSyncTest.java    |  26 +-
 .../apache/solr/update/SoftAutoCommitTest.java  |   1 -
 .../solr/update/SolrCmdDistributorTest.java     |   3 +-
 .../apache/solr/update/SolrIndexConfigTest.java |   3 +-
 .../solr/update/SolrIndexSplitterTest.java      |   3 +-
 .../update/TestDocBasedVersionConstraints.java  |   1 -
 .../solr/update/TestExceedMaxTermLength.java    |   3 +-
 .../apache/solr/update/TestHdfsUpdateLog.java   |   3 +-
 .../solr/update/TestIndexingPerformance.java    |   1 -
 .../apache/solr/update/UpdateParamsTest.java    |   1 -
 .../org/apache/solr/update/VersionInfoTest.java |   3 +-
 ...dSchemaFieldsUpdateProcessorFactoryTest.java |   1 -
 .../update/processor/AtomicUpdatesTest.java     |  31 +-
 .../CloneFieldUpdateProcessorFactoryTest.java   |   1 -
 .../processor/CustomUpdateRequestProcessor.java |   1 -
 .../CustomUpdateRequestProcessorFactory.java    |   1 -
 .../DefaultValueUpdateProcessorTest.java        |   1 -
 ...DocExpirationUpdateProcessorFactoryTest.java |   1 -
 .../FieldMutatingUpdateProcessorTest.java       |   1 -
 ...ommitOptimizeUpdateProcessorFactoryTest.java |   3 +-
 .../ParsingFieldUpdateProcessorsTest.java       |   1 -
 .../PreAnalyzedUpdateProcessorTest.java         |  13 +-
 .../RecordingUpdateProcessorFactory.java        |   1 -
 .../solr/update/processor/RuntimeUrp.java       |   3 +-
 .../solr/update/processor/ScriptEngineTest.java |   1 -
 .../SignatureUpdateProcessorFactoryTest.java    |   1 -
 ...atelessScriptUpdateProcessorFactoryTest.java |   3 +-
 .../processor/TestNamedUpdateProcessors.java    |   4 +-
 .../TestPartialUpdateDeduplication.java         |   3 +-
 .../UUIDUpdateProcessorFallbackTest.java        |   3 +-
 .../UniqFieldsUpdateProcessorFactoryTest.java   |   1 -
 .../processor/UpdateProcessorTestBase.java      |   3 +-
 .../UpdateRequestProcessorFactoryTest.java      |   1 -
 .../test/org/apache/solr/util/BitSetPerf.java   |   1 -
 .../org/apache/solr/util/CircularListTest.java  |   1 -
 .../test/org/apache/solr/util/DOMUtilTest.java  |   3 +-
 .../apache/solr/util/DateMathParserTest.java    |   1 -
 .../org/apache/solr/util/DistanceUnitsTest.java |   9 +-
 .../org/apache/solr/util/FileUtilsTest.java     |   3 +-
 .../org/apache/solr/util/MockCoreContainer.java |   3 +-
 .../org/apache/solr/util/PrimUtilsTest.java     |  14 +-
 .../apache/solr/util/SimplePostToolTest.java    |   3 +-
 .../apache/solr/util/SolrPluginUtilsTest.java   |   1 -
 .../apache/solr/util/TestFastOutputStream.java  |   1 -
 .../org/apache/solr/util/TestFastWriter.java    |   1 -
 .../solr/util/TestObjectReleaseTracker.java     |   3 +-
 .../org/apache/solr/util/TestRTimerTree.java    |   3 +-
 .../solr/util/TestRandomForceMergePolicy.java   |  36 -
 .../apache/solr/util/TestRandomMergePolicy.java |  74 --
 .../apache/solr/util/TestSolrCLIRunExample.java |   3 +-
 .../apache/solr/util/TestSystemIdResolver.java  |   3 +-
 .../org/apache/solr/util/TestTestInjection.java |   3 +-
 .../test/org/apache/solr/util/TestUtils.java    |   1 -
 .../org/apache/solr/util/TimeZoneUtilsTest.java |   1 -
 .../BigEndianAscendingWordDeserializerTest.java |   1 -
 .../BigEndianAscendingWordSerializerTest.java   |   1 -
 .../org/apache/solr/util/hll/BitVectorTest.java |   1 -
 .../apache/solr/util/hll/ExplicitHLLTest.java   |   1 -
 .../org/apache/solr/util/hll/FullHLLTest.java   |   1 -
 .../solr/util/hll/HLLSerializationTest.java     |   1 -
 .../org/apache/solr/util/hll/HLLUtilTest.java   |   1 -
 .../solr/util/hll/IntegrationTestGenerator.java |   1 -
 .../solr/util/hll/ProbabilisticTestUtil.java    |   1 -
 .../org/apache/solr/util/hll/SparseHLLTest.java |   1 -
 .../solr/client/solrj/ResponseParser.java       |   1 -
 .../apache/solr/client/solrj/SolrClient.java    |   1 -
 .../org/apache/solr/client/solrj/SolrQuery.java |   1 -
 .../apache/solr/client/solrj/SolrRequest.java   |   1 -
 .../apache/solr/client/solrj/SolrResponse.java  |   1 -
 .../solr/client/solrj/SolrServerException.java  |   1 -
 .../client/solrj/StreamingResponseCallback.java |   1 -
 .../client/solrj/beans/BindingException.java    |   3 +-
 .../solr/client/solrj/impl/CloudSolrClient.java |   3 +-
 .../solrj/impl/ConcurrentUpdateSolrClient.java  |   1 -
 .../client/solrj/impl/HttpClientConfigurer.java |   4 +-
 .../solr/client/solrj/impl/HttpSolrClient.java  |   2 +-
 .../solrj/impl/InputStreamResponseParser.java   |   3 +-
 .../solrj/impl/Krb5HttpClientConfigurer.java    |   3 +-
 .../client/solrj/impl/NoOpResponseParser.java   |   3 +-
 .../solrj/impl/SolrHttpRequestRetryHandler.java |   3 +-
 .../impl/SolrPortAwareCookieSpecFactory.java    |  33 +-
 .../client/solrj/impl/XMLResponseParser.java    |   1 -
 .../solr/client/solrj/io/SolrClientCache.java   |   3 +-
 .../org/apache/solr/client/solrj/io/Tuple.java  |   3 +-
 .../client/solrj/io/comp/ComparatorLambda.java  |  11 +-
 .../client/solrj/io/comp/ComparatorOrder.java   |   7 +-
 .../client/solrj/io/comp/FieldComparator.java   |   1 -
 .../solr/client/solrj/io/comp/HashKey.java      |  14 +-
 .../solrj/io/comp/MultipleFieldComparator.java  |   1 -
 .../client/solrj/io/comp/StreamComparator.java  |   1 -
 .../solr/client/solrj/io/eq/Equalitor.java      |   5 +-
 .../solr/client/solrj/io/eq/FieldEqualitor.java |   1 -
 .../solrj/io/eq/MultipleFieldEqualitor.java     |   1 -
 .../client/solrj/io/eq/StreamEqualitor.java     |   1 -
 .../client/solrj/io/ops/ConcatOperation.java    |  23 +-
 .../client/solrj/io/ops/DistinctOperation.java  |  33 +-
 .../client/solrj/io/ops/GroupOperation.java     |  33 +-
 .../client/solrj/io/ops/ReduceOperation.java    |   6 +-
 .../client/solrj/io/ops/ReplaceOperation.java   |  21 +-
 .../solrj/io/ops/ReplaceWithFieldOperation.java |  23 +-
 .../solrj/io/ops/ReplaceWithValueOperation.java |  23 +-
 .../client/solrj/io/ops/StreamOperation.java    |  19 +-
 .../client/solrj/io/sql/ConnectionImpl.java     |  46 +-
 .../solrj/io/sql/DatabaseMetaDataImpl.java      |  16 +-
 .../solr/client/solrj/io/sql/DriverImpl.java    |   7 +-
 .../solr/client/solrj/io/sql/ResultSetImpl.java | 245 ++++-
 .../solrj/io/sql/ResultSetMetaDataImpl.java     |  55 +-
 .../solr/client/solrj/io/sql/StatementImpl.java |  41 +-
 .../client/solrj/io/stream/BiJoinStream.java    |   1 -
 .../client/solrj/io/stream/CloudSolrStream.java |  13 +-
 .../solrj/io/stream/ComplementStream.java       |   1 -
 .../client/solrj/io/stream/DaemonStream.java    |   2 -
 .../client/solrj/io/stream/ExceptionStream.java |   1 -
 .../client/solrj/io/stream/FacetStream.java     |   3 +-
 .../client/solrj/io/stream/HashJoinStream.java  |   1 -
 .../client/solrj/io/stream/InnerJoinStream.java |   1 -
 .../client/solrj/io/stream/IntersectStream.java |   1 -
 .../solr/client/solrj/io/stream/JDBCStream.java |   1 -
 .../client/solrj/io/stream/JSONTupleStream.java |  33 +-
 .../solr/client/solrj/io/stream/JoinStream.java |  33 +-
 .../solrj/io/stream/LeftOuterJoinStream.java    |   1 -
 .../client/solrj/io/stream/MergeStream.java     |   1 -
 .../solrj/io/stream/OuterHashJoinStream.java    |   1 -
 .../client/solrj/io/stream/ParallelStream.java  |   1 -
 .../client/solrj/io/stream/PushBackStream.java  |   1 -
 .../solr/client/solrj/io/stream/RankStream.java |   1 -
 .../client/solrj/io/stream/ReducerStream.java   |   1 -
 .../client/solrj/io/stream/RollupStream.java    |   8 +-
 .../client/solrj/io/stream/SelectStream.java    |   1 -
 .../solr/client/solrj/io/stream/SolrStream.java |   1 -
 .../client/solrj/io/stream/StatsStream.java     |   3 +-
 .../client/solrj/io/stream/StreamContext.java   |   1 -
 .../client/solrj/io/stream/TupleStream.java     |   1 -
 .../client/solrj/io/stream/UniqueStream.java    |   1 -
 .../solrj/io/stream/expr/Expressible.java       |   7 +-
 .../solrj/io/stream/expr/StreamExpression.java  |   9 +-
 .../expr/StreamExpressionNamedParameter.java    |   7 +-
 .../stream/expr/StreamExpressionParameter.java  |   3 +-
 .../io/stream/expr/StreamExpressionParser.java  |  22 +-
 .../io/stream/expr/StreamExpressionValue.java   |   3 +-
 .../solrj/io/stream/expr/StreamFactory.java     |  33 +-
 .../client/solrj/io/stream/metrics/Bucket.java  |  11 +-
 .../solrj/io/stream/metrics/CountMetric.java    |   3 +-
 .../solrj/io/stream/metrics/MaxMetric.java      |   3 +-
 .../solrj/io/stream/metrics/MeanMetric.java     |   3 +-
 .../client/solrj/io/stream/metrics/Metric.java  |   3 +-
 .../solrj/io/stream/metrics/MinMetric.java      |   3 +-
 .../solrj/io/stream/metrics/SumMetric.java      |   3 +-
 .../solrj/request/AbstractUpdateRequest.java    |   3 +-
 .../solrj/request/CollectionAdminRequest.java   |   1 -
 .../solrj/request/ConfigSetAdminRequest.java    |   1 -
 .../request/ContentStreamUpdateRequest.java     |   4 +-
 .../client/solrj/request/CoreAdminRequest.java  |   1 -
 .../client/solrj/request/DirectXmlRequest.java  |   1 -
 .../solrj/request/DocumentAnalysisRequest.java  |   1 -
 .../solrj/request/FieldAnalysisRequest.java     |   1 -
 .../solrj/request/GenericSolrRequest.java       |   3 +-
 .../client/solrj/request/IsUpdateRequest.java   |   4 +-
 .../solr/client/solrj/request/LukeRequest.java  |   1 -
 .../solr/client/solrj/request/QueryRequest.java |   1 -
 .../client/solrj/request/RequestWriter.java     |   1 -
 .../solr/client/solrj/request/SolrPing.java     |   1 -
 .../client/solrj/request/UpdateRequest.java     |   2 +-
 .../request/schema/AbstractSchemaRequest.java   |   3 +-
 .../request/schema/AnalyzerDefinition.java      |   3 +-
 .../request/schema/FieldTypeDefinition.java     |   3 +-
 .../solrj/request/schema/SchemaRequest.java     |   3 +-
 .../solrj/response/AnalysisResponseBase.java    |   1 -
 .../solr/client/solrj/response/Cluster.java     |   3 +-
 .../solrj/response/ClusteringResponse.java      |   3 +-
 .../solrj/response/CollectionAdminResponse.java |   1 -
 .../solrj/response/ConfigSetAdminResponse.java  |   1 -
 .../solrj/response/CoreAdminResponse.java       |   1 -
 .../response/DocumentAnalysisResponse.java      |   1 -
 .../solr/client/solrj/response/FacetField.java  |   1 -
 .../solrj/response/FieldAnalysisResponse.java   |   1 -
 .../solr/client/solrj/response/Group.java       |   3 +-
 .../client/solrj/response/GroupCommand.java     |   3 +-
 .../client/solrj/response/GroupResponse.java    |   3 +-
 .../client/solrj/response/IntervalFacet.java    |   8 +-
 .../client/solrj/response/LukeResponse.java     |   1 -
 .../solr/client/solrj/response/PivotField.java  |   1 -
 .../client/solrj/response/QueryResponse.java    |   1 -
 .../solr/client/solrj/response/RangeFacet.java  |   3 +-
 .../solrj/response/SimpleSolrResponse.java      |   4 +-
 .../client/solrj/response/SolrPingResponse.java |   1 -
 .../client/solrj/response/SolrResponseBase.java |   1 -
 .../solrj/response/SpellCheckResponse.java      |   3 +-
 .../solrj/response/SuggesterResponse.java       |   3 +-
 .../solr/client/solrj/response/Suggestion.java  |   2 +-
 .../client/solrj/response/TermsResponse.java    |   3 +-
 .../client/solrj/response/UpdateResponse.java   |   1 -
 .../schema/FieldTypeRepresentation.java         |   3 +-
 .../response/schema/SchemaRepresentation.java   |   3 +-
 .../solrj/response/schema/SchemaResponse.java   |   3 +-
 .../solr/client/solrj/util/ClientUtils.java     |   1 -
 .../java/org/apache/solr/common/Callable.java   |   3 +-
 .../apache/solr/common/EmptyEntityResolver.java |   3 +-
 .../org/apache/solr/common/EnumFieldValue.java  |   3 +-
 .../org/apache/solr/common/SolrDocument.java    |   1 -
 .../apache/solr/common/SolrDocumentBase.java    |  13 +-
 .../apache/solr/common/SolrDocumentList.java    |   1 -
 .../org/apache/solr/common/SolrException.java   |   1 -
 .../apache/solr/common/SolrInputDocument.java   |   1 -
 .../org/apache/solr/common/SolrInputField.java  |   1 -
 .../org/apache/solr/common/StringUtils.java     |   3 +-
 .../org/apache/solr/common/cloud/Aliases.java   |   3 +-
 .../solr/common/cloud/BeforeReconnect.java      |  27 +-
 .../solr/common/cloud/ClosableThread.java       |   3 +-
 .../apache/solr/common/cloud/ClusterState.java  |   3 +-
 .../solr/common/cloud/ClusterStateUtil.java     |  31 +-
 .../solr/common/cloud/CompositeIdRouter.java    |   3 +-
 .../solr/common/cloud/ConnectionManager.java    |   7 +-
 .../common/cloud/DefaultConnectionStrategy.java |  27 +-
 .../solr/common/cloud/DefaultZkACLProvider.java |  13 +-
 .../cloud/DefaultZkCredentialsProvider.java     |   9 +-
 .../apache/solr/common/cloud/DocCollection.java |   3 +-
 .../org/apache/solr/common/cloud/DocRouter.java |   3 +-
 .../solr/common/cloud/HashBasedRouter.java      |   3 +-
 .../solr/common/cloud/ImplicitDocRouter.java    |   3 +-
 .../apache/solr/common/cloud/OnReconnect.java   |  27 +-
 .../apache/solr/common/cloud/PlainIdRouter.java |   5 +-
 .../org/apache/solr/common/cloud/Replica.java   |   3 +-
 .../apache/solr/common/cloud/RoutingRule.java   |   3 +-
 .../solr/common/cloud/SaslZkACLProvider.java    |   3 +-
 .../org/apache/solr/common/cloud/Slice.java     |   3 +-
 .../apache/solr/common/cloud/SolrZkClient.java  |  23 +-
 .../apache/solr/common/cloud/SolrZooKeeper.java |   3 +-
 ...ParamsAllAndReadonlyDigestZkACLProvider.java |  23 +-
 ...tCredentialsDigestZkCredentialsProvider.java |  17 +-
 .../apache/solr/common/cloud/ZkACLProvider.java |  11 +-
 .../cloud/ZkClientConnectionStrategy.java       |  27 +-
 .../apache/solr/common/cloud/ZkCmdExecutor.java |   3 +-
 .../solr/common/cloud/ZkConfigManager.java      |   1 -
 .../solr/common/cloud/ZkCoreNodeProps.java      |  27 +-
 .../common/cloud/ZkCredentialsProvider.java     |   7 +-
 .../apache/solr/common/cloud/ZkNodeProps.java   |   3 +-
 .../apache/solr/common/cloud/ZkOperation.java   |   6 +-
 .../apache/solr/common/cloud/ZkStateReader.java |   5 +-
 .../solr/common/cloud/ZooKeeperException.java   |   4 +-
 .../org/apache/solr/common/luke/FieldFlag.java  |   4 +-
 .../solr/common/params/AnalysisParams.java      |   1 -
 .../solr/common/params/AppendedSolrParams.java  |   1 -
 .../solr/common/params/CollectionParams.java    |   3 +-
 .../solr/common/params/CommonAdminParams.java   |   1 -
 .../apache/solr/common/params/CommonParams.java |   1 -
 .../solr/common/params/ConfigSetParams.java     |   3 +-
 .../solr/common/params/CoreAdminParams.java     |   1 -
 .../solr/common/params/CursorMarkParams.java    |   1 -
 .../solr/common/params/DefaultSolrParams.java   |   1 -
 .../apache/solr/common/params/DisMaxParams.java |   1 -
 .../apache/solr/common/params/EventParams.java  |   4 +-
 .../apache/solr/common/params/ExpandParams.java |   1 -
 .../apache/solr/common/params/FacetParams.java  |   1 -
 .../apache/solr/common/params/GroupParams.java  |   1 -
 .../solr/common/params/HighlightParams.java     |   1 -
 .../solr/common/params/MapSolrParams.java       |   1 -
 .../common/params/ModifiableSolrParams.java     |   1 -
 .../solr/common/params/MoreLikeThisParams.java  |   1 -
 .../solr/common/params/MultiMapSolrParams.java  |   1 -
 .../common/params/QueryElevationParams.java     |   4 +-
 .../solr/common/params/RequiredSolrParams.java  |   1 -
 .../apache/solr/common/params/ShardParams.java  |   1 -
 .../apache/solr/common/params/SimpleParams.java |   3 +-
 .../apache/solr/common/params/SolrParams.java   |   1 -
 .../solr/common/params/SpatialParams.java       |   4 +-
 .../solr/common/params/SpellingParams.java      |   1 -
 .../apache/solr/common/params/StatsParams.java  |   1 -
 .../solr/common/params/TermVectorParams.java    |   4 +-
 .../apache/solr/common/params/TermsParams.java  |   1 -
 .../apache/solr/common/params/UpdateParams.java |   1 -
 .../org/apache/solr/common/util/ByteUtils.java  |   1 -
 .../java/org/apache/solr/common/util/Cache.java |   3 +-
 .../apache/solr/common/util/ContentStream.java  |   1 -
 .../solr/common/util/ContentStreamBase.java     |   1 -
 .../solr/common/util/DataInputInputStream.java  |   1 -
 .../org/apache/solr/common/util/DateUtil.java   |   3 +-
 .../apache/solr/common/util/ExecutorUtil.java   |  11 +-
 .../solr/common/util/FastInputStream.java       |   1 -
 .../solr/common/util/FastOutputStream.java      |   1 -
 .../java/org/apache/solr/common/util/Hash.java  |   3 +-
 .../org/apache/solr/common/util/IOUtils.java    |  15 +-
 .../apache/solr/common/util/IteratorChain.java  |   1 -
 .../org/apache/solr/common/util/NamedList.java  |   1 -
 .../solr/common/util/ObjectReleaseTracker.java  |   3 +-
 .../java/org/apache/solr/common/util/Pair.java  |   3 +-
 .../org/apache/solr/common/util/RetryUtil.java  |  11 +-
 .../solr/common/util/SimpleOrderedMap.java      |   3 +-
 .../common/util/SolrjNamedThreadFactory.java    |   9 +-
 .../org/apache/solr/common/util/StrUtils.java   |   1 -
 .../solr/common/util/SuppressForbidden.java     |   3 +-
 .../org/apache/solr/common/util/URLUtil.java    |   1 -
 .../java/org/apache/solr/common/util/Utils.java |   4 +-
 .../java/org/apache/solr/common/util/XML.java   |   1 -
 .../apache/solr/common/util/XMLErrorLogger.java |   1 -
 ...ollectionAdminRequestRequiredParamsTest.java |   3 +-
 .../apache/solr/client/solrj/GetByIdTest.java   |   3 +-
 .../solr/client/solrj/LargeVolumeTestBase.java  |   1 -
 .../solrj/MergeIndexesExampleTestBase.java      |   1 -
 .../client/solrj/SolrExampleBinaryTest.java     |   1 -
 .../solr/client/solrj/SolrExampleTestBase.java  |   1 -
 .../solr/client/solrj/SolrExampleTests.java     |   1 -
 .../solr/client/solrj/SolrExampleTestsBase.java |   1 -
 .../solr/client/solrj/SolrExampleXMLTest.java   |   1 -
 .../solr/client/solrj/SolrExceptionTest.java    |   1 -
 .../apache/solr/client/solrj/SolrQueryTest.java |   1 -
 .../client/solrj/SolrSchemalessExampleTest.java |   1 -
 .../solr/client/solrj/StartSolrJetty.java       |   1 -
 .../solr/client/solrj/TestLBHttpSolrClient.java |   1 -
 .../client/solrj/TestSolrJErrorHandling.java    |   7 +-
 .../AbstractEmbeddedSolrServerTestCase.java     |   3 +-
 .../client/solrj/embedded/JettyWebappTest.java  |   1 -
 .../solrj/embedded/LargeVolumeEmbeddedTest.java |   1 -
 .../solrj/embedded/LargeVolumeJettyTest.java    |   1 -
 .../embedded/MergeIndexesEmbeddedTest.java      |   1 -
 .../solrj/embedded/SolrExampleEmbeddedTest.java |   1 -
 .../solrj/embedded/SolrExampleJettyTest.java    |   1 -
 .../SolrExampleStreamingBinaryTest.java         |   3 +-
 .../embedded/SolrExampleStreamingTest.java      |   1 -
 .../solrj/embedded/TestEmbeddedSolrServer.java  |   3 +-
 .../solrj/embedded/TestSolrProperties.java      |   1 -
 .../solrj/impl/BasicHttpSolrClientTest.java     |   7 +-
 .../CloudSolrClientMultiConstructorTest.java    |  21 +-
 .../client/solrj/impl/CloudSolrClientTest.java  |   3 +-
 .../impl/ConcurrentUpdateSolrClientTest.java    |   3 -
 .../solrj/impl/ExternalHttpClientTest.java      |   3 +-
 .../client/solrj/impl/LBHttpSolrClientTest.java |   1 -
 .../solrj/impl/SolrPortAwareCookieSpecTest.java |   3 +-
 .../impl/TestCloudSolrClientConnections.java    |   3 +-
 .../client/solrj/io/sql/JdbcDriverTest.java     |   3 +-
 .../solr/client/solrj/io/sql/JdbcTest.java      | 349 ++++++-
 .../client/solrj/io/stream/JDBCStreamTest.java  |   3 +-
 .../solrj/io/stream/RecordCountStream.java      |   2 +-
 .../solrj/io/stream/StreamExpressionTest.java   |  66 +-
 .../stream/StreamExpressionToExpessionTest.java |  22 +-
 .../client/solrj/io/stream/StreamingTest.java   |   3 +-
 .../stream/expr/StreamExpressionParserTest.java |   3 +-
 .../io/stream/ops/ConcatOperationTest.java      |   3 +-
 .../solrj/io/stream/ops/OperationsTest.java     |   3 +-
 .../solr/client/solrj/request/SchemaTest.java   |   3 +-
 .../solr/client/solrj/request/SolrPingTest.java |   3 +-
 .../request/TestConfigSetAdminRequest.java      |   1 -
 .../client/solrj/request/TestCoreAdmin.java     |   1 -
 .../client/solrj/request/TestUpdateRequest.java |   3 +-
 .../solrj/response/AnlysisResponseBaseTest.java |   1 -
 .../response/DocumentAnalysisResponseTest.java  |   1 -
 .../client/solrj/response/FacetFieldTest.java   |   3 +-
 .../response/FieldAnalysisResponseTest.java     |   1 -
 .../solrj/response/NoOpResponseParserTest.java  |   3 +-
 .../solrj/response/QueryResponseTest.java       |   1 -
 .../solrj/response/TermsResponseTest.java       |   3 +-
 .../solrj/response/TestClusteringResponse.java  |   3 +-
 .../solrj/response/TestSpellCheckResponse.java  |   3 +-
 .../solrj/response/TestSuggesterResponse.java   |   3 +-
 .../solr/client/solrj/util/ClientUtilsTest.java |   1 -
 .../apache/solr/common/SolrDocumentTest.java    |   1 -
 .../solr/common/cloud/SolrZkClientTest.java     |   3 +-
 .../solr/common/cloud/TestZkConfigManager.java  |   1 -
 .../common/params/CommonAdminParamsTest.java    |   1 -
 .../solr/common/params/CommonParamsTest.java    |   1 -
 .../common/params/ModifiableSolrParamsTest.java |  25 +-
 .../solr/common/params/ShardParamsTest.java     |   3 +-
 .../solr/common/params/SolrParamTest.java       |   1 -
 .../solr/common/util/ContentStreamTest.java     |   1 -
 .../solr/common/util/IteratorChainTest.java     |   1 -
 .../apache/solr/common/util/NamedListTest.java  |   1 -
 .../apache/solr/common/util/TestDateUtil.java   |   3 +-
 .../org/apache/solr/common/util/TestHash.java   |   3 +-
 .../solr/common/util/TestJavaBinCodec.java      |   3 +-
 .../solr/common/util/TestJsonRecordReader.java  |   3 +-
 .../apache/solr/common/util/TestRetryUtil.java  |   3 +-
 .../solr/common/util/TestXMLEscaping.java       |   1 -
 .../apache/solr/common/util/URLUtilTest.java    |   1 -
 .../solr/BaseDistributedSearchTestCase.java     |   3 +-
 .../src/java/org/apache/solr/JSONTestUtil.java  |   1 -
 .../apache/solr/SolrIgnoredThreadsFilter.java   |  13 +-
 .../java/org/apache/solr/SolrJettyTestBase.java |   3 +-
 .../java/org/apache/solr/SolrTestCaseHS.java    |   4 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   1 -
 .../solr/analysis/MockCharFilterFactory.java    |   3 +-
 .../solr/analysis/MockTokenFilterFactory.java   |   3 +-
 .../solr/analysis/MockTokenizerFactory.java     |   3 +-
 .../analysis/StringMockSolrResourceLoader.java  |   3 +-
 .../solr/cloud/AbstractDistribZkTestBase.java   |   3 +-
 .../apache/solr/cloud/AbstractZkTestCase.java   |   3 +-
 .../java/org/apache/solr/cloud/ChaosMonkey.java |   7 +-
 .../org/apache/solr/cloud/CloudInspectUtil.java |  33 +-
 .../java/org/apache/solr/cloud/IpTables.java    |   4 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java |   3 +-
 .../org/apache/solr/cloud/MockSolrZkClient.java |   3 +-
 .../apache/solr/cloud/MockZkStateReader.java    |   3 +-
 .../java/org/apache/solr/cloud/SocketProxy.java |   3 +-
 .../solr/cloud/StoppableIndexingThread.java     |  25 +-
 .../solr/cloud/StoppableSearchThread.java       |   7 +-
 .../org/apache/solr/cloud/ZkTestServer.java     |  27 +-
 .../solr/core/AbstractBadConfigTestBase.java    |   1 -
 .../apache/solr/core/MockDirectoryFactory.java  |   6 +-
 .../solr/core/MockFSDirectoryFactory.java       |   4 +-
 .../component/TrackingShardHandlerFactory.java  |   3 +-
 .../processor/BufferingRequestProcessor.java    |   1 -
 .../apache/solr/util/AbstractSolrTestCase.java  |   2 -
 .../apache/solr/util/BadHdfsThreadsFilter.java  |   3 +-
 .../solr/util/BadMrClusterThreadsFilter.java    |   3 +-
 .../solr/util/BadZookeeperThreadsFilter.java    |   3 +-
 .../org/apache/solr/util/BaseTestHarness.java   |   3 +-
 .../org/apache/solr/util/DOMUtilTestBase.java   |   1 -
 .../org/apache/solr/util/ExternalPaths.java     |   3 +-
 .../apache/solr/util/RESTfulServerProvider.java |   3 +-
 .../solr/util/RandomForceMergePolicy.java       |   1 -
 .../org/apache/solr/util/RandomMergePolicy.java |  52 +-
 .../apache/solr/util/ReadOnlyCoresLocator.java  |   3 +-
 .../java/org/apache/solr/util/RestTestBase.java |   3 +-
 .../org/apache/solr/util/RestTestHarness.java   |   3 +-
 .../util/RevertDefaultThreadHandlerRule.java    |  23 +-
 .../org/apache/solr/util/SSLTestConfig.java     |   3 +-
 .../java/org/apache/solr/util/TestHarness.java  |   1 -
 5346 files changed, 22854 insertions(+), 22215 deletions(-)
----------------------------------------------------------------------