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

[30/50] [abbrv] lucene-solr:apiv2: LUCENE-7319: remove unused imports

LUCENE-7319: remove unused imports


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

Branch: refs/heads/apiv2
Commit: 52f5c502468846138f73ab83837528fa91a54733
Parents: b9ded92
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Jun 13 09:35:09 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Jun 13 09:59:14 2016 +0100

----------------------------------------------------------------------
 .../lucene/analysis/ar/ArabicAnalyzer.java      |  1 -
 .../charfilter/HTMLStripCharFilter.java         |  1 -
 .../analysis/charfilter/NormalizeCharMap.java   |  2 --
 .../lucene/analysis/ckb/SoraniAnalyzer.java     |  1 -
 .../HyphenationCompoundWordTokenFilter.java     |  1 -
 ...phenationCompoundWordTokenFilterFactory.java |  1 -
 .../lucene/analysis/core/StopAnalyzer.java      |  1 -
 .../lucene/analysis/en/PorterStemmer.java       |  4 ---
 .../lucene/analysis/fa/PersianAnalyzer.java     |  1 -
 .../lucene/analysis/hi/HindiAnalyzer.java       |  1 -
 .../WordDelimiterFilterFactory.java             |  2 --
 .../analysis/ngram/EdgeNGramTokenizer.java      |  1 -
 .../lucene/analysis/nl/DutchAnalyzer.java       |  1 -
 .../pattern/PatternCaptureGroupTokenFilter.java |  1 -
 .../query/QueryAutoStopWordAnalyzer.java        |  1 -
 .../analysis/standard/ClassicTokenizerImpl.java |  1 -
 .../standard/UAX29URLEmailTokenizerFactory.java |  1 -
 .../analysis/synonym/SynonymFilterFactory.java  |  2 --
 .../lucene/analysis/synonym/SynonymMap.java     |  2 --
 .../apache/lucene/analysis/th/ThaiAnalyzer.java |  1 -
 .../lucene/analysis/tr/TurkishAnalyzer.java     |  1 -
 .../analysis/wikipedia/WikipediaTokenizer.java  |  1 -
 .../lucene/collation/CollationKeyAnalyzer.java  |  2 --
 .../lucene/analysis/ar/TestArabicAnalyzer.java  |  1 -
 .../ar/TestArabicNormalizationFilter.java       |  1 -
 .../bg/TestBulgarianStemFilterFactory.java      |  1 -
 .../analysis/br/TestBrazilianAnalyzer.java      |  1 -
 .../TestHTMLStripCharFilterFactory.java         |  1 -
 .../analysis/cjk/TestCJKWidthFilterFactory.java |  1 -
 .../lucene/analysis/ckb/TestSoraniAnalyzer.java |  1 -
 .../TestSoraniNormalizationFilterFactory.java   |  1 -
 .../commongrams/CommonGramsFilterTest.java      |  1 -
 .../TestCommonGramsQueryFilterFactory.java      |  3 --
 .../analysis/core/TestKeywordAnalyzer.java      |  1 -
 .../lucene/analysis/core/TestRandomChains.java  |  1 -
 .../de/TestGermanLightStemFilterFactory.java    |  1 -
 .../analysis/de/TestGermanStemFilter.java       |  1 -
 .../el/TestGreekLowerCaseFilterFactory.java     |  1 -
 .../analysis/el/TestGreekStemFilterFactory.java |  1 -
 .../en/TestEnglishMinimalStemFilterFactory.java |  1 -
 .../analysis/en/TestKStemFilterFactory.java     |  1 -
 .../en/TestPorterStemFilterFactory.java         |  1 -
 .../lucene/analysis/fa/TestPersianAnalyzer.java |  1 -
 .../TestPersianNormalizationFilterFactory.java  |  1 -
 .../fr/TestFrenchLightStemFilterFactory.java    |  1 -
 .../fr/TestFrenchMinimalStemFilterFactory.java  |  1 -
 .../ga/TestIrishLowerCaseFilterFactory.java     |  1 -
 .../TestGalicianMinimalStemFilterFactory.java   |  1 -
 .../gl/TestGalicianStemFilterFactory.java       |  1 -
 .../lucene/analysis/hi/TestHindiAnalyzer.java   |  1 -
 .../lucene/analysis/hi/TestHindiFilters.java    |  2 --
 .../lucene/analysis/hi/TestHindiNormalizer.java |  4 ---
 .../hu/TestHungarianLightStemFilterFactory.java |  1 -
 .../analysis/hunspell/Test64kAffixes.java       |  2 --
 .../analysis/hunspell/TestAllDictionaries.java  |  1 -
 .../analysis/hunspell/TestAllDictionaries2.java |  1 -
 .../analysis/hunspell/TestDictionary.java       |  1 -
 .../hunspell/TestHunspellStemFilter.java        |  1 -
 .../it/TestItalianLightStemFilterFactory.java   |  1 -
 .../miscellaneous/TestKeywordMarkerFilter.java  |  2 --
 .../miscellaneous/TestTrimFilterFactory.java    |  1 -
 .../no/TestNorwegianLightStemFilterFactory.java |  1 -
 .../TestPatternReplaceCharFilterFactory.java    |  1 -
 .../TestPatternReplaceFilterFactory.java        |  1 -
 .../DelimitedPayloadTokenFilterTest.java        |  4 ---
 .../pt/TestPortugueseStemFilterFactory.java     |  1 -
 .../reverse/TestReverseStringFilterFactory.java |  1 -
 .../ru/TestRussianLightStemFilterFactory.java   |  1 -
 .../analysis/shingle/ShingleFilterTest.java     |  1 -
 .../shingle/TestShingleFilterFactory.java       |  1 -
 .../standard/TestStandardFactories.java         |  1 -
 .../lucene/analysis/th/TestThaiAnalyzer.java    |  1 -
 .../collation/ICUCollationKeyAnalyzer.java      |  3 --
 .../icu/TestICUFoldingFilterFactory.java        |  1 -
 .../icu/TestICUNormalizer2FilterFactory.java    |  1 -
 .../icu/TestICUTransformFilterFactory.java      |  1 -
 .../segmentation/TestICUTokenizerFactory.java   |  1 -
 .../analysis/ja/dict/ConnectionCosts.java       |  1 -
 .../lucene/analysis/ja/dict/UserDictionary.java |  1 -
 .../TestDoubleMetaphoneFilterFactory.java       |  3 --
 .../TestStempelPolishStemFilterFactory.java     |  1 -
 .../uima/UIMAAnnotationsTokenizerFactory.java   |  1 -
 .../lucene/analysis/uima/UIMABaseAnalyzer.java  |  1 -
 ...IMATypeAwareAnnotationsTokenizerFactory.java |  1 -
 .../uima/UIMATypeAwareAnalyzerTest.java         |  1 -
 .../lucene50/Lucene50SegmentInfoFormat.java     |  4 ---
 .../lucene50/Lucene50RWSegmentInfoFormat.java   |  4 ---
 .../benchmark/byTask/tasks/AddIndexesTask.java  |  3 --
 .../byTask/tasks/NearRealtimeReaderTask.java    |  1 -
 .../benchmark/byTask/tasks/OpenReaderTask.java  |  1 -
 .../lucene/benchmark/byTask/tasks/ReadTask.java |  1 -
 .../byTask/tasks/ReopenReaderTask.java          |  1 -
 .../byTask/tasks/RollbackIndexTask.java         |  2 --
 .../byTask/tasks/WriteEnwikiLineDocTask.java    |  1 -
 .../benchmark/quality/utils/SimpleQQParser.java |  1 -
 .../tasks/WriteEnwikiLineDocTaskTest.java       |  4 ---
 .../lucene/classification/Classifier.java       |  4 ---
 .../SimpleNaiveBayesDocumentClassifier.java     |  2 --
 .../classification/utils/DatasetSplitter.java   |  2 --
 .../SimpleNaiveBayesClassifierTest.java         |  1 -
 .../utils/DocToDoubleVectorUtilsTest.java       |  2 --
 .../codecs/blockterms/BlockTermsReader.java     |  1 -
 .../blocktreeords/OrdsIntersectTermsEnum.java   |  2 --
 .../blocktreeords/OrdsSegmentTermsEnum.java     |  2 --
 .../lucene/codecs/memory/FSTOrdTermsReader.java |  1 -
 .../simpletext/SimpleTextFieldsReader.java      |  1 -
 .../simpletext/SimpleTextLiveDocsFormat.java    |  2 --
 .../simpletext/SimpleTextTermVectorsReader.java |  1 -
 .../java/org/apache/lucene/analysis/Token.java  |  1 -
 .../org/apache/lucene/codecs/NormsConsumer.java |  2 --
 .../lucene/codecs/StoredFieldsWriter.java       |  1 -
 .../apache/lucene/codecs/TermVectorsWriter.java |  1 -
 .../codecs/lucene50/Lucene50PostingsFormat.java |  1 -
 .../lucene62/Lucene62SegmentInfoFormat.java     |  1 -
 .../org/apache/lucene/index/DocIDMerger.java    |  2 --
 .../index/DocumentsWriterPerThreadPool.java     |  2 --
 .../apache/lucene/index/IndexWriterConfig.java  |  1 -
 .../lucene/index/MappingMultiPostingsEnum.java  |  2 --
 .../org/apache/lucene/index/MergePolicy.java    |  2 --
 .../org/apache/lucene/index/MergeState.java     |  1 -
 .../org/apache/lucene/index/MultiSorter.java    |  1 -
 .../index/TermVectorsConsumerPerField.java      |  1 -
 .../apache/lucene/index/TermsHashPerField.java  |  1 -
 .../apache/lucene/search/BlendedTermQuery.java  |  1 -
 .../EarlyTerminatingSortingCollector.java       |  1 -
 .../apache/lucene/search/FuzzyTermsEnum.java    |  1 -
 .../java/org/apache/lucene/search/Multiset.java |  2 --
 .../apache/lucene/search/PointInSetQuery.java   |  6 ----
 .../org/apache/lucene/search/RegexpQuery.java   |  1 -
 .../lucene/store/ByteArrayIndexInput.java       |  2 --
 .../org/apache/lucene/util/CharsRefBuilder.java |  1 -
 .../automaton/DaciukMihovAutomatonBuilder.java  |  1 -
 .../lucene/util/mutable/MutableValueStr.java    |  1 -
 .../util/packed/MonotonicBlockPackedWriter.java |  1 -
 .../lucene/util/packed/MonotonicLongValues.java |  1 -
 .../lucene54/TestLucene54DocValuesFormat.java   |  2 --
 .../apache/lucene/document/TestFieldType.java   |  2 --
 .../org/apache/lucene/index/Test2BPoints.java   |  6 ----
 .../index/TestBinaryDocValuesUpdates.java       |  2 --
 .../org/apache/lucene/index/TestCodecs.java     |  5 ---
 .../lucene/index/TestDirectoryReader.java       |  1 -
 .../apache/lucene/index/TestDocIDMerger.java    |  2 --
 .../lucene/index/TestDocsAndPositions.java      |  1 -
 .../apache/lucene/index/TestFieldsReader.java   |  1 -
 .../lucene/index/TestIndexFileDeleter.java      |  4 ---
 .../org/apache/lucene/index/TestIndexInput.java |  4 ---
 .../apache/lucene/index/TestIndexSorting.java   |  7 ----
 .../apache/lucene/index/TestIndexWriter.java    |  3 --
 .../lucene/index/TestIndexWriterCommit.java     |  1 -
 .../lucene/index/TestIndexWriterConfig.java     |  1 -
 .../lucene/index/TestIndexWriterForceMerge.java |  4 ---
 .../lucene/index/TestIndexWriterFromReader.java |  1 -
 .../index/TestIndexWriterLockRelease.java       |  2 --
 .../lucene/index/TestIndexWriterOnDiskFull.java |  2 --
 .../index/TestIndexingSequenceNumbers.java      |  2 --
 .../lucene/index/TestMergeRateLimiter.java      |  2 --
 .../lucene/index/TestMixedDocValuesUpdates.java |  1 -
 .../apache/lucene/index/TestMultiTermsEnum.java |  1 -
 .../apache/lucene/index/TestNeverDelete.java    |  2 --
 .../apache/lucene/index/TestNoMergePolicy.java  |  1 -
 .../index/TestNumericDocValuesUpdates.java      |  2 --
 .../apache/lucene/index/TestOmitPositions.java  |  1 -
 .../org/apache/lucene/index/TestOmitTf.java     |  2 --
 .../index/TestParallelCompositeReader.java      |  2 --
 .../lucene/index/TestParallelTermEnum.java      |  1 -
 .../org/apache/lucene/index/TestPayloads.java   |  1 -
 .../lucene/index/TestPerSegmentDeletes.java     |  2 --
 .../TestPersistentSnapshotDeletionPolicy.java   |  1 -
 .../apache/lucene/index/TestReaderClosed.java   |  1 -
 .../apache/lucene/index/TestSegmentInfos.java   |  1 -
 .../index/TestSnapshotDeletionPolicy.java       |  2 --
 .../TestEarlyTerminatingSortingCollector.java   |  6 ----
 .../apache/lucene/search/TestIndexSearcher.java |  1 -
 .../lucene/search/TestMatchNoDocsQuery.java     |  1 -
 .../apache/lucene/search/TestPhraseQuery.java   |  1 -
 .../apache/lucene/search/TestRegexpRandom2.java |  1 -
 .../apache/lucene/search/TestScorerPerf.java    |  2 --
 .../lucene/search/TestSimilarityProvider.java   |  1 -
 .../lucene/store/TestBufferedIndexInput.java    |  1 -
 .../org/apache/lucene/store/TestDirectory.java  |  1 -
 .../lucene/store/TestFileSwitchDirectory.java   |  1 -
 .../apache/lucene/store/TestRateLimiter.java    |  1 -
 .../lucene/store/TestSimpleFSLockFactory.java   |  1 -
 .../apache/lucene/util/Test2BPagedBytes.java    |  1 -
 .../org/apache/lucene/util/TestIOUtils.java     |  1 -
 .../util/TestRecyclingByteBlockAllocator.java   |  1 -
 .../util/TestRecyclingIntBlockAllocator.java    |  1 -
 .../automaton/FiniteStringsIteratorTest.java    |  1 -
 .../LimitedFiniteStringsIteratorTest.java       |  1 -
 .../test/org/apache/lucene/demo/TestDemo.java   |  2 --
 .../TestExpressionAggregationFacetsExample.java |  3 --
 .../demo/facet/TestRangeFacetsExample.java      |  2 --
 .../facet/TestSimpleSortedSetFacetsExample.java |  1 -
 .../lucene/expressions/js/JavascriptLexer.java  |  3 --
 .../lucene/expressions/js/JavascriptParser.java |  3 --
 .../DefaultSortedSetDocValuesReaderState.java   |  1 -
 .../lucene/facet/taxonomy/TestFacetLabel.java   |  2 --
 .../taxonomy/directory/TestAddTaxonomy.java     | 14 --------
 .../grouping/AbstractGroupFacetCollector.java   |  1 -
 .../highlight/OffsetLimitTokenFilterTest.java   |  1 -
 .../vectorhighlight/IndexTimeSynonymTest.java   |  4 ---
 .../search/join/ToParentBlockJoinQuery.java     |  2 --
 .../lucene/search/join/TestBlockJoin.java       |  1 -
 .../lucene/index/memory/TestMemoryIndex.java    |  6 ----
 .../memory/TestMemoryIndexAgainstRAMDir.java    |  1 -
 .../lucene/index/MultiPassIndexSplitter.java    |  1 -
 .../index/TestMultiPassIndexSplitter.java       |  1 -
 .../search/TestDiversifiedTopDocsCollector.java |  1 -
 .../apache/lucene/util/fst/TestFSTsMisc.java    |  1 -
 .../lucene/queries/function/BoostedQuery.java   |  1 -
 .../function/valuesource/DoubleFieldSource.java |  1 -
 .../SumTotalTermFreqValueSource.java            |  1 -
 .../apache/lucene/queries/TermsQueryTest.java   |  2 --
 .../queries/TestCustomScoreExplanations.java    |  1 -
 .../lucene/queryparser/classic/QueryParser.java |  1 -
 .../classic/QueryParserTokenManager.java        | 10 ------
 .../queryparser/ext/ExtendableQueryParser.java  |  1 -
 .../builders/DummyQueryNodeBuilder.java         |  1 -
 .../StandardSyntaxParserTokenManager.java       | 22 ------------
 .../MultiFieldQueryNodeProcessor.java           |  1 -
 .../StandardQueryNodeProcessorPipeline.java     |  3 --
 .../surround/parser/QueryParser.java            |  2 --
 .../parser/QueryParserTokenManager.java         | 13 --------
 .../queryparser/classic/TestMultiAnalyzer.java  |  2 --
 .../classic/TestMultiPhraseQueryParsing.java    |  1 -
 .../precedence/TestPrecedenceQueryParser.java   |  1 -
 .../standard/TestMultiAnalyzerQPHelper.java     |  3 --
 .../flexible/standard/TestStandardQP.java       |  2 --
 .../simple/TestSimpleQueryParser.java           |  1 -
 .../xml/TestQueryTemplateManager.java           |  1 -
 .../lucene/replicator/nrt/CopyOneFile.java      |  2 --
 .../apache/lucene/replicator/nrt/CopyState.java |  1 -
 .../org/apache/lucene/replicator/nrt/Node.java  | 10 ------
 .../replicator/nrt/ReplicaFileDeleter.java      |  2 --
 .../nrt/SegmentInfosSearcherManager.java        |  1 -
 .../IndexAndTaxonomyRevisionTest.java           |  1 -
 .../lucene/replicator/IndexRevisionTest.java    |  1 -
 .../lucene/replicator/LocalReplicatorTest.java  |  1 -
 .../lucene/replicator/ReplicatorTestCase.java   |  2 --
 .../lucene/replicator/nrt/Connection.java       |  2 --
 .../org/apache/lucene/replicator/nrt/Jobs.java  |  2 --
 .../lucene/replicator/nrt/SimpleCopyJob.java    | 35 --------------------
 .../lucene/replicator/nrt/SimpleTransLog.java   |  3 --
 .../replicator/nrt/TestNRTReplication.java      |  1 -
 .../nrt/TestStressNRTReplication.java           |  1 -
 .../idversion/IDVersionPostingsReader.java      |  1 -
 .../idversion/IDVersionSegmentTermsEnum.java    |  1 -
 .../sandbox/queries/SlowFuzzyTermsEnum.java     |  1 -
 .../search/TokenStreamToTermAutomatonQuery.java |  2 --
 .../org/apache/lucene/spatial3d/Geo3DPoint.java |  9 -----
 .../spatial3d/geom/GeoComplexPolygon.java       |  2 --
 .../lucene/spatial3d/geom/StandardXYZSolid.java |  2 --
 .../apache/lucene/spatial3d/TestGeo3DPoint.java |  1 -
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |  2 --
 .../lucene/search/spell/DirectSpellChecker.java |  2 --
 .../lucene/search/spell/LuceneDictionary.java   |  1 -
 .../search/spell/WordBreakSpellChecker.java     |  1 -
 .../analyzing/AnalyzingInfixSuggester.java      |  1 -
 .../search/suggest/analyzing/FSTUtil.java       |  1 -
 .../suggest/analyzing/SuggestStopFilter.java    |  1 -
 .../suggest/fst/FSTCompletionBuilder.java       |  1 -
 .../search/suggest/jaspell/JaspellLookup.java   |  1 -
 .../search/suggest/FileDictionaryTest.java      |  1 -
 .../lucene/search/suggest/PersistenceTest.java  |  1 -
 .../analyzing/AnalyzingInfixSuggesterTest.java  |  2 --
 .../analyzing/AnalyzingSuggesterTest.java       |  1 -
 .../suggest/analyzing/FuzzySuggesterTest.java   |  1 -
 .../search/suggest/fst/FSTCompletionTest.java   |  1 -
 .../search/suggest/fst/WFSTCompletionTest.java  |  1 -
 .../lucene/analysis/CollationTestBase.java      |  1 -
 .../apache/lucene/analysis/MockAnalyzer.java    |  1 -
 .../apache/lucene/analysis/MockCharFilter.java  |  1 -
 .../lucene/analysis/MockPayloadAnalyzer.java    |  1 -
 .../codecs/asserting/AssertingPointsFormat.java |  1 -
 .../codecs/cranky/CrankyPointsFormat.java       |  3 --
 .../index/BaseTermVectorsFormatTestCase.java    |  2 --
 .../java/org/apache/lucene/index/DocHelper.java |  1 -
 .../apache/lucene/index/ForceMergePolicy.java   |  3 --
 .../ThreadedIndexingAndSearchingTestCase.java   |  1 -
 .../lucene/mockfile/MockFileSystemTestCase.java |  1 -
 .../org/apache/lucene/mockfile/WindowsFS.java   |  4 ---
 .../lucene/store/BaseLockFactoryTestCase.java   |  1 -
 .../apache/lucene/util/CloseableDirectory.java  |  1 -
 .../org/apache/lucene/util/LineFileDocs.java    |  1 -
 .../analysis/TestLookaheadTokenFilter.java      |  1 -
 .../TestCompressingStoredFieldsFormat.java      |  4 ---
 .../TestCompressingTermVectorsFormat.java       |  1 -
 .../lucene/index/TestAssertingLeafReader.java   |  8 -----
 .../lucene/mockfile/TestHandleTrackingFS.java   |  4 ---
 .../apache/lucene/mockfile/TestWindowsFS.java   |  2 --
 .../lucene/store/TestMockDirectoryWrapper.java  |  4 ---
 .../solr/schema/TestICUCollationField.java      |  2 --
 .../analytics/facet/FieldFacetExtrasTest.java   |  1 -
 .../solr/analytics/facet/FieldFacetTest.java    |  1 -
 .../handler/dataimport/DIHCacheSupport.java     |  3 --
 .../handler/dataimport/DataImportHandler.java   |  6 ----
 .../solr/handler/dataimport/DebugInfo.java      |  1 -
 .../solr/handler/dataimport/Evaluator.java      |  5 ---
 .../solr/handler/dataimport/UrlEvaluator.java   |  1 -
 .../dataimport/XPathEntityProcessor.java        |  1 -
 .../apache/solr/handler/dataimport/Zipper.java  |  1 -
 .../dataimport/config/ConfigParseUtil.java      |  6 ----
 .../solr/handler/dataimport/TestDataConfig.java |  1 -
 .../solr/handler/dataimport/TestDocBuilder.java |  1 -
 .../handler/dataimport/TestEphemeralCache.java  |  1 -
 .../dataimport/TestFileListEntityProcessor.java |  1 -
 .../TestFileListWithLineEntityProcessor.java    |  1 -
 .../dataimport/TestHierarchicalDocBuilder.java  |  1 -
 .../dataimport/TestNonWritablePersistFile.java  |  1 -
 .../TestPlainTextEntityProcessor.java           |  1 -
 .../dataimport/TestScriptTransformer.java       |  2 --
 .../dataimport/TestSimplePropertiesWriter.java  |  2 --
 .../dataimport/TestSqlEntityProcessorDelta.java |  1 -
 ...anguageIdentifierUpdateProcessorFactory.java |  1 -
 .../LanguageIdentifierUpdateProcessor.java      |  1 -
 .../solr/hadoop/MapReduceIndexerTool.java       |  3 --
 .../apache/solr/hadoop/SolrOutputFormat.java    |  1 -
 .../apache/solr/hadoop/MorphlineMapperTest.java |  1 -
 .../src/java/org/apache/solr/cloud/Assign.java  |  1 -
 .../org/apache/solr/cloud/DistributedMap.java   |  1 -
 .../solr/cloud/SizeLimitedDistributedMap.java   |  2 --
 .../apache/solr/cloud/overseer/NodeMutator.java |  1 -
 .../solr/cloud/overseer/OverseerAction.java     |  2 --
 .../solr/cloud/overseer/SliceMutator.java       |  2 --
 .../solr/cloud/overseer/ZkStateWriter.java      |  2 --
 .../apache/solr/cloud/rule/ReplicaAssigner.java |  1 -
 .../org/apache/solr/core/BlobRepository.java    |  6 ----
 .../org/apache/solr/core/ConfigOverlay.java     |  4 ---
 .../org/apache/solr/core/ConfigSetService.java  |  1 -
 .../org/apache/solr/core/CoreContainer.java     |  1 -
 .../apache/solr/core/HdfsDirectoryFactory.java  |  1 -
 .../solr/core/SimpleFSDirectoryFactory.java     |  1 -
 .../src/java/org/apache/solr/core/SolrCore.java |  1 -
 .../java/org/apache/solr/core/SolrCores.java    |  2 --
 .../solr/handler/ContentStreamHandlerBase.java  |  1 -
 .../org/apache/solr/handler/GraphHandler.java   |  2 --
 .../solr/handler/MoreLikeThisHandler.java       |  2 --
 .../apache/solr/handler/RealTimeGetHandler.java |  1 -
 .../apache/solr/handler/RequestHandlerBase.java |  2 --
 .../solr/handler/admin/ConfigSetsHandler.java   |  1 -
 .../solr/handler/admin/CoreAdminHandler.java    |  2 --
 .../handler/admin/ShowFileRequestHandler.java   |  2 --
 .../handler/admin/SolrInfoMBeanHandler.java     |  1 -
 .../handler/component/HighlightComponent.java   |  1 -
 .../solr/handler/component/QueryComponent.java  |  2 --
 .../handler/component/RealTimeGetComponent.java |  1 -
 .../handler/component/SpellCheckComponent.java  |  2 --
 .../handler/component/SpellCheckMergeData.java  |  1 -
 .../handler/component/StatsValuesFactory.java   |  3 --
 .../solr/handler/component/TermsComponent.java  |  1 -
 .../solr/highlight/PostingsSolrHighlighter.java |  1 -
 .../solr/index/SlowCompositeReaderWrapper.java  |  1 -
 .../apache/solr/index/SortingMergePolicy.java   | 21 ------------
 .../org/apache/solr/internal/csv/CSVParser.java |  2 --
 .../apache/solr/internal/csv/CSVPrinter.java    |  2 --
 .../org/apache/solr/parser/QueryParser.java     |  6 ----
 .../solr/parser/QueryParserTokenManager.java    | 13 --------
 .../apache/solr/parser/SolrQueryParserBase.java |  1 -
 .../apache/solr/request/SolrRequestInfo.java    |  1 -
 .../org/apache/solr/request/json/JSONUtil.java  |  6 ----
 .../apache/solr/request/json/ObjectUtil.java    |  3 --
 .../solr/response/BinaryResponseWriter.java     |  1 -
 .../solr/response/GeoJSONResponseWriter.java    |  1 -
 .../solr/response/JSONResponseWriter.java       |  5 ---
 .../response/PHPSerializedResponseWriter.java   |  1 -
 .../org/apache/solr/response/ResultContext.java |  1 -
 .../transform/ExcludedMarkerFactory.java        |  2 --
 .../org/apache/solr/rest/SolrSchemaRestApi.java |  2 --
 .../schema/analysis/ManagedWordSetResource.java |  1 -
 .../solr/schema/JsonPreAnalyzedParser.java      |  1 -
 .../solr/schema/ManagedIndexSchemaFactory.java  |  2 --
 .../solr/search/CollapsingQParserPlugin.java    |  1 -
 .../apache/solr/search/DisMaxQParserPlugin.java |  1 -
 .../java/org/apache/solr/search/DocSlice.java   |  1 -
 .../search/ExtendedDismaxQParserPlugin.java     |  1 -
 .../apache/solr/search/FieldQParserPlugin.java  |  1 -
 .../solr/search/FunctionQParserPlugin.java      |  1 -
 .../solr/search/FunctionRangeQParserPlugin.java |  1 -
 .../apache/solr/search/JoinQParserPlugin.java   |  1 -
 .../java/org/apache/solr/search/LRUCache.java   |  1 -
 .../apache/solr/search/LuceneQParserPlugin.java |  2 --
 .../solr/search/OldLuceneQParserPlugin.java     |  1 -
 .../apache/solr/search/PrefixQParserPlugin.java |  3 --
 .../java/org/apache/solr/search/QParser.java    |  1 -
 .../org/apache/solr/search/QueryContext.java    |  1 -
 .../org/apache/solr/search/QueryParsing.java    |  3 --
 .../apache/solr/search/RawQParserPlugin.java    |  1 -
 .../apache/solr/search/ReRankQParserPlugin.java |  1 -
 .../apache/solr/search/SimpleQParserPlugin.java |  1 -
 .../apache/solr/search/SolrFieldCacheMBean.java |  1 -
 .../org/apache/solr/search/SolrQueryParser.java | 18 ----------
 .../apache/solr/search/SolrReturnFields.java    |  1 -
 .../solr/search/SpatialBoxQParserPlugin.java    |  1 -
 .../solr/search/SpatialFilterQParserPlugin.java |  1 -
 .../solr/search/SurroundQParserPlugin.java      |  1 -
 .../apache/solr/search/TermQParserPlugin.java   |  1 -
 .../apache/solr/search/TermsQParserPlugin.java  |  1 -
 .../apache/solr/search/XmlQParserPlugin.java    |  1 -
 .../solr/search/facet/AggValueSource.java       |  1 -
 .../org/apache/solr/search/facet/BlockJoin.java |  1 -
 .../apache/solr/search/facet/FacetField.java    |  1 -
 .../facet/FacetFieldProcessorNumeric.java       |  1 -
 .../apache/solr/search/facet/FacetRequest.java  |  2 --
 .../org/apache/solr/search/facet/FieldUtil.java |  2 --
 .../org/apache/solr/search/facet/HLLAgg.java    |  5 ---
 .../apache/solr/search/facet/LegacyFacet.java   |  1 -
 .../solr/search/facet/SimpleAggValueSource.java |  3 --
 .../org/apache/solr/search/facet/SlotAcc.java   |  8 -----
 .../solr/search/facet/StrAggValueSource.java    |  7 ----
 .../solr/search/facet/UnInvertedField.java      |  1 -
 .../solr/search/function/FileFloatSource.java   |  1 -
 .../apache/solr/search/grouping/Command.java    |  2 --
 .../SearchGroupsResultTransformer.java          |  2 --
 .../join/BlockJoinParentQParserPlugin.java      |  1 -
 .../solr/search/join/GraphQParserPlugin.java    |  1 -
 .../org/apache/solr/search/join/GraphQuery.java |  3 --
 .../solr/search/join/GraphQueryParser.java      |  1 -
 .../search/join/ScoreJoinQParserPlugin.java     |  1 -
 .../solr/search/mlt/MLTQParserPlugin.java       |  1 -
 .../SweetSpotSimilarityFactory.java             |  1 -
 .../apache/solr/search/stats/LRUStatsCache.java |  5 ---
 .../solr/security/AuthorizationContext.java     |  1 -
 .../security/AutorizationEditOperation.java     |  2 --
 .../apache/solr/security/KerberosPlugin.java    |  1 -
 .../security/RuleBasedAuthorizationPlugin.java  |  2 --
 .../solr/servlet/DirectSolrConnection.java      |  6 ----
 .../org/apache/solr/servlet/HttpSolrCall.java   |  5 ---
 .../solr/servlet/cache/HttpCacheHeaderUtil.java |  2 --
 .../spelling/AbstractLuceneSpellChecker.java    |  6 ----
 .../solr/spelling/DirectSolrSpellChecker.java   |  6 ----
 .../solr/store/blockcache/BlockCache.java       |  1 -
 .../apache/solr/store/blockcache/Metrics.java   |  1 -
 .../solr/update/DeleteByQueryWrapper.java       |  1 -
 .../apache/solr/update/DeleteUpdateCommand.java |  2 --
 ...tractDefaultValueUpdateProcessorFactory.java |  2 --
 .../CountFieldValuesUpdateProcessorFactory.java | 10 ------
 .../DefaultValueUpdateProcessorFactory.java     |  4 ---
 .../DistributingUpdateProcessorFactory.java     |  2 --
 .../FieldMutatingUpdateProcessorFactory.java    |  1 -
 .../FieldValueSubsetUpdateProcessorFactory.java |  2 --
 .../FirstFieldValueUpdateProcessorFactory.java  |  1 -
 .../LastFieldValueUpdateProcessorFactory.java   |  1 -
 .../solr/update/processor/MD5Signature.java     |  1 -
 .../MaxFieldValueUpdateProcessorFactory.java    |  1 -
 .../MinFieldValueUpdateProcessorFactory.java    |  1 -
 .../NoOpDistributingUpdateProcessorFactory.java |  2 --
 .../ParseDateFieldUpdateProcessorFactory.java   |  2 --
 .../update/processor/RegexpBoostProcessor.java  |  1 -
 .../processor/RunUpdateProcessorFactory.java    |  1 -
 .../TimestampUpdateProcessorFactory.java        |  7 ----
 .../processor/TolerantUpdateProcessor.java      |  6 ----
 .../TolerantUpdateProcessorFactory.java         |  1 -
 .../UniqFieldsUpdateProcessorFactory.java       |  9 -----
 .../processor/UpdateRequestProcessorChain.java  |  1 -
 .../org/apache/solr/util/CommandOperation.java  |  3 --
 .../org/apache/solr/util/PivotListEntry.java    |  2 --
 .../src/java/org/apache/solr/util/SolrCLI.java  |  1 -
 .../org/apache/solr/util/SolrPluginUtils.java   |  1 -
 .../solr/util/xslt/TransformerProvider.java     |  1 -
 .../solr/DistributedIntervalFacetingTest.java   |  1 -
 .../test/org/apache/solr/SolrInfoMBeanTest.java |  1 -
 .../solr/TestSimpleTrackingShardHandler.java    |  1 -
 .../PathHierarchyTokenizerFactoryTest.java      |  3 --
 .../apache/solr/cloud/AliasIntegrationTest.java |  2 --
 .../solr/cloud/BaseCdcrDistributedZkTest.java   |  2 --
 .../org/apache/solr/cloud/ClusterStateTest.java |  1 -
 ...ConcurrentDeleteAndCreateCollectionTest.java |  1 -
 .../solr/cloud/ConnectionManagerTest.java       |  5 ---
 .../solr/cloud/DeleteInactiveReplicaTest.java   |  1 -
 .../DeleteLastCustomShardedReplicaTest.java     |  1 -
 .../solr/cloud/DistribCursorPagingTest.java     |  3 --
 .../apache/solr/cloud/HttpPartitionTest.java    |  1 -
 ...verseerCollectionConfigSetProcessorTest.java |  1 -
 .../org/apache/solr/cloud/OverseerTest.java     |  1 -
 .../solr/cloud/RecoveryAfterSoftCommitTest.java |  1 -
 .../solr/cloud/ReplicationFactorTest.java       |  1 -
 .../org/apache/solr/cloud/SSLMigrationTest.java |  1 -
 .../cloud/SimpleCollectionCreateDeleteTest.java |  2 --
 .../apache/solr/cloud/SolrCloudExampleTest.java |  2 --
 .../org/apache/solr/cloud/SyncSliceTest.java    |  2 --
 .../solr/cloud/TestCloudDeleteByQuery.java      |  7 ----
 .../apache/solr/cloud/TestCloudInspectUtil.java |  2 --
 .../apache/solr/cloud/TestCollectionAPI.java    |  1 -
 .../apache/solr/cloud/TestConfigSetsAPI.java    |  1 -
 .../cloud/TestConfigSetsAPIExclusivity.java     |  1 -
 .../solr/cloud/TestConfigSetsAPIZkFailure.java  |  1 -
 .../org/apache/solr/cloud/TestCryptoKeys.java   |  1 -
 .../org/apache/solr/cloud/TestLockTree.java     |  7 ----
 .../solr/cloud/TestMiniSolrCloudClusterSSL.java |  1 -
 .../apache/solr/cloud/TestSSLRandomization.java |  2 --
 .../TestStressCloudBlindAtomicUpdates.java      |  6 ----
 .../solr/cloud/hdfs/HdfsThreadLeakTest.java     |  2 --
 .../solr/core/BlobRepositoryCloudTest.java      |  6 ----
 .../solr/core/BlobRepositoryMockingTest.java    |  2 --
 .../solr/core/HdfsDirectoryFactoryTest.java     |  5 ---
 .../org/apache/solr/core/MockInfoMBean.java     |  1 -
 .../apache/solr/core/TestDynamicLoading.java    |  1 -
 .../apache/solr/core/TestInfoStreamLogging.java |  1 -
 .../apache/solr/core/TestJmxMonitoredMap.java   |  3 --
 .../FieldAnalysisRequestHandlerTest.java        |  4 ---
 .../org/apache/solr/handler/JsonLoaderTest.java |  4 ---
 .../handler/StandardRequestHandlerTest.java     |  8 -----
 .../apache/solr/handler/TestBlobHandler.java    |  1 -
 .../org/apache/solr/handler/TestCSVLoader.java  |  1 -
 .../apache/solr/handler/TestConfigReload.java   |  1 -
 .../apache/solr/handler/TestReqParamsAPI.java   |  1 -
 .../handler/TestSolrConfigHandlerCloud.java     |  1 -
 .../TestSolrConfigHandlerConcurrent.java        |  2 --
 .../handler/ThrowErrorOnInitRequestHandler.java |  1 -
 .../admin/CoreMergeIndexesAdminHandlerTest.java |  3 --
 .../component/DistributedMLTComponentTest.java  |  1 -
 .../handler/component/TestExpandComponent.java  |  1 -
 .../handler/component/TestPivotHelperCode.java  |  3 --
 .../highlight/HighlighterMaxOffsetTest.java     |  1 -
 .../solr/internal/csv/CSVPrinterTest.java       |  3 --
 .../solr/internal/csv/CSVStrategyTest.java      |  2 --
 .../csv/ExtendedBufferedReaderTest.java         |  2 --
 .../org/apache/solr/request/JSONWriterTest.java |  4 ---
 .../solr/request/TestBinaryResponseWriter.java  |  1 -
 .../org/apache/solr/request/TestFaceting.java   |  1 -
 .../solr/request/TestIntervalFaceting.java      |  1 -
 .../TestPHPSerializedResponseWriter.java        |  1 -
 .../solr/response/TestRawResponseWriter.java    |  4 ---
 .../schema/CurrencyFieldOpenExchangeTest.java   | 10 ------
 .../solr/schema/CurrencyFieldXmlFileTest.java   |  9 -----
 .../org/apache/solr/schema/EnumFieldTest.java   |  1 -
 .../org/apache/solr/schema/PolyFieldTest.java   |  1 -
 .../solr/schema/TestBulkSchemaConcurrent.java   |  1 -
 .../TestCloudManagedSchemaConcurrent.java       |  1 -
 .../apache/solr/schema/TestCloudSchemaless.java |  2 --
 .../apache/solr/schema/TestCollationField.java  |  1 -
 .../apache/solr/search/AnalyticsQueryTest.java  |  1 -
 .../solr/search/DelayingSearchComponent.java    |  1 -
 .../apache/solr/search/FooQParserPlugin.java    |  1 -
 .../apache/solr/search/QueryParsingTest.java    |  8 -----
 .../org/apache/solr/search/RankQueryTest.java   |  1 -
 .../apache/solr/search/SortSpecParsingTest.java |  1 -
 .../solr/search/TestCollapseQParserPlugin.java  |  1 -
 .../search/TestGraphTermsQParserPlugin.java     | 12 -------
 .../solr/search/TestHashQParserPlugin.java      |  5 ---
 .../org/apache/solr/search/TestLRUCache.java    |  5 ---
 .../apache/solr/search/TestMissingGroups.java   |  2 --
 .../org/apache/solr/search/TestQueryUtils.java  |  2 --
 .../search/TestRandomCollapseQParserPlugin.java |  3 --
 .../solr/search/TestReRankQParserPlugin.java    |  1 -
 .../org/apache/solr/search/TestRealTimeGet.java |  1 -
 .../apache/solr/search/TestRecoveryHdfs.java    |  1 -
 .../test/org/apache/solr/search/TestReload.java |  2 --
 .../org/apache/solr/search/TestSearchPerf.java  |  1 -
 .../solr/search/TestSimpleQParserPlugin.java    |  3 --
 .../apache/solr/search/TestSolrQueryParser.java |  1 -
 .../test/org/apache/solr/search/TestSort.java   |  1 -
 .../solr/search/facet/TestJsonFacets.java       |  3 --
 .../solr/search/function/TestFunctionQuery.java |  1 -
 .../function/TestMinMaxOnMultiValuedField.java  |  4 ---
 .../function/TestSortByMinMaxFunction.java      |  2 --
 .../apache/solr/search/join/BJQParserTest.java  |  1 -
 .../solr/search/mlt/SimpleMLTQParserTest.java   |  4 ---
 .../TestClassicSimilarityFactory.java           |  1 -
 .../TestNonDefinedSimilarityFactory.java        |  1 -
 ...stPerFieldSimilarityWithDefaultOverride.java |  2 --
 .../TestSweetSpotSimilarityFactory.java         |  1 -
 .../solr/search/stats/TestDistribIDF.java       |  1 -
 .../security/TestPKIAuthenticationPlugin.java   |  6 ----
 .../apache/solr/servlet/ResponseHeaderTest.java |  4 ---
 .../spelling/FileBasedSpellCheckerTest.java     |  1 -
 .../solr/spelling/SimpleQueryConverter.java     |  2 --
 .../spelling/TestSuggestSpellingConverter.java  |  1 -
 .../suggest/TestFreeTextSuggestions.java        |  1 -
 .../apache/solr/uninverting/TestFieldCache.java | 10 ------
 .../apache/solr/update/AddBlockUpdateTest.java  |  2 --
 .../update/DirectUpdateHandlerOptimizeTest.java |  1 -
 .../solr/update/TestExceedMaxTermLength.java    |  1 -
 .../org/apache/solr/update/VersionInfoTest.java |  2 --
 .../processor/CustomUpdateRequestProcessor.java |  4 ---
 .../DefaultValueUpdateProcessorTest.java        |  5 ---
 ...DocExpirationUpdateProcessorFactoryTest.java |  1 -
 ...ommitOptimizeUpdateProcessorFactoryTest.java |  5 ---
 .../RecordingUpdateProcessorFactory.java        |  3 --
 ...atelessScriptUpdateProcessorFactoryTest.java |  5 ---
 .../processor/TestNamedUpdateProcessors.java    |  1 -
 .../TestPartialUpdateDeduplication.java         |  3 --
 .../processor/TolerantUpdateProcessorTest.java  |  2 --
 .../UniqFieldsUpdateProcessorFactoryTest.java   |  1 -
 .../processor/UpdateProcessorTestBase.java      |  1 -
 .../org/apache/solr/util/TestFastWriter.java    |  3 --
 .../solrj/impl/InputStreamResponseParser.java   |  4 ---
 .../solrj/impl/Krb5HttpClientBuilder.java       |  7 ----
 .../solr/client/solrj/io/comp/HashKey.java      |  2 --
 .../solrj/io/comp/MultipleFieldComparator.java  |  1 -
 .../client/solrj/io/stream/BiJoinStream.java    |  8 -----
 .../solrj/io/stream/LeftOuterJoinStream.java    |  4 ---
 .../client/solrj/io/stream/StreamContext.java   |  2 --
 .../solrj/io/stream/expr/StreamExplanation.java |  2 --
 .../solr/client/solrj/response/FacetField.java  |  1 -
 .../solr/client/solrj/response/PivotField.java  |  2 --
 .../solr/common/cloud/ClusterStateUtil.java     |  2 --
 .../apache/solr/common/cloud/SolrZkClient.java  |  1 -
 .../solr/common/cloud/ZkConfigManager.java      |  1 -
 .../apache/solr/client/solrj/GetByIdTest.java   |  2 --
 .../solrj/MergeIndexesExampleTestBase.java      |  1 -
 .../client/solrj/SolrSchemalessExampleTest.java |  1 -
 .../solrj/beans/TestDocumentObjectBinder.java   |  2 --
 .../embedded/LargeVolumeBinaryJettyTest.java    |  1 -
 .../solrj/embedded/LargeVolumeEmbeddedTest.java |  1 -
 .../solrj/embedded/LargeVolumeJettyTest.java    |  1 -
 .../solrj/embedded/SolrExampleEmbeddedTest.java |  1 -
 .../solr/client/solrj/io/graph/GraphTest.java   |  2 --
 .../client/solrj/io/sql/JdbcDriverTest.java     |  1 -
 .../solrj/io/stream/RecordCountStream.java      |  1 -
 .../StreamExpressionToExplanationTest.java      |  1 -
 .../io/stream/ops/ConcatOperationTest.java      |  1 -
 .../solrj/request/TestUpdateRequestCodec.java   |  2 --
 .../solr/common/cloud/TestZkConfigManager.java  |  1 -
 .../solr/common/util/TestJsonRecordReader.java  |  1 -
 .../solr/analysis/MockTokenizerFactory.java     |  1 -
 .../java/org/apache/solr/cloud/ChaosMonkey.java |  1 -
 .../org/apache/solr/cloud/MockSolrZkClient.java |  1 -
 .../org/apache/solr/util/BaseTestHarness.java   |  1 -
 .../org/apache/solr/util/ExternalPaths.java     |  4 ---
 .../org/apache/solr/util/RandomMergePolicy.java |  8 -----
 .../org/apache/solr/util/SSLTestConfig.java     |  4 ---
 622 files changed, 1320 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
index ae827e0..0beadfb 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
@@ -30,7 +30,6 @@ import org.apache.lucene.analysis.util.CharArraySet;
 import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.util.Version;
 
 /**
  * {@link Analyzer} for Arabic. 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
index 1f681a8..fea84d8 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.charfilter;
 
 import java.io.IOException;
 import java.io.Reader;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java
index e724374..ffc832f 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java
@@ -22,9 +22,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.apache.lucene.util.CharsRef;
-import org.apache.lucene.util.IntsRef;
 import org.apache.lucene.util.IntsRefBuilder;
-import org.apache.lucene.util.fst.Builder;
 import org.apache.lucene.util.fst.CharSequenceOutputs;
 import org.apache.lucene.util.fst.FST;
 import org.apache.lucene.util.fst.Outputs;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniAnalyzer.java
index ef29c2f..f1697b7 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniAnalyzer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniAnalyzer.java
@@ -34,7 +34,6 @@ import org.apache.lucene.analysis.util.CharArraySet;
 import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
 import org.apache.lucene.analysis.util.WordlistLoader;
 import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.Version;
 
 /**
  * {@link Analyzer} for Sorani Kurdish.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
index c047358..bef438c 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
@@ -23,7 +23,6 @@ import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree;
 import org.apache.lucene.analysis.util.CharArraySet;
 import org.xml.sax.InputSource;
 
-import java.io.File;
 import java.io.IOException;
 
 /**

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
index 3b8d0b7..9ffe405 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
@@ -30,7 +30,6 @@ import java.util.Map;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.lucene.util.Version;
 import org.xml.sax.InputSource;
 
 /**

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java
index 9f4b05a..0c8fdc8 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java
@@ -17,7 +17,6 @@
 package org.apache.lucene.analysis.core;
 
 
-import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
 import java.nio.file.Path;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
index ef239b1..897798b 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
@@ -44,10 +44,6 @@ package org.apache.lucene.analysis.en;
 */
 
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.FileInputStream;
-
 import org.apache.lucene.util.ArrayUtil;
 
 /**

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
index 36a9d5f..4014d82 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
@@ -30,7 +30,6 @@ import org.apache.lucene.analysis.core.StopFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
 import org.apache.lucene.analysis.util.CharArraySet;
 import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
-import org.apache.lucene.util.Version;
 
 /**
  * {@link Analyzer} for Persian.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
index 4947ed9..9fffe23 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
@@ -30,7 +30,6 @@ import org.apache.lucene.analysis.core.DecimalDigitFilter;
 import org.apache.lucene.analysis.core.LowerCaseFilter;
 import org.apache.lucene.analysis.core.StopFilter;
 import org.apache.lucene.analysis.in.IndicNormalizationFilter;
-import org.apache.lucene.util.Version;
 
 /**
  * Analyzer for Hindi.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java
index a7e58bf..2f51a2b 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java
@@ -23,8 +23,6 @@ import org.apache.lucene.analysis.util.CharArraySet;
 import org.apache.lucene.analysis.util.ResourceLoader;
 import org.apache.lucene.analysis.util.ResourceLoaderAware;
 import org.apache.lucene.analysis.util.TokenFilterFactory;
-import org.apache.lucene.util.Version;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java
index 5356c9a..3d253b5 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.ngram;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.util.AttributeFactory;
-import org.apache.lucene.util.Version;
 
 /**
  * Tokenizes the input from an edge into n-grams of given size(s).

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
index e955067..e8b152d 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
@@ -31,7 +31,6 @@ import org.apache.lucene.analysis.standard.StandardTokenizer;
 import org.apache.lucene.analysis.util.CharArrayMap;
 import org.apache.lucene.analysis.util.CharArraySet;
 import org.apache.lucene.analysis.util.WordlistLoader;
-import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.CharsRefBuilder;
 import org.apache.lucene.util.IOUtils;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupTokenFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupTokenFilter.java
index 5563c23..f5c203c 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupTokenFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupTokenFilter.java
@@ -24,7 +24,6 @@ import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.CharsRefBuilder;
 
 /**

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
index 3ba7927..61475d2 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
@@ -30,7 +30,6 @@ import org.apache.lucene.index.Terms;
 import org.apache.lucene.index.TermsEnum;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRefBuilder;
-import org.apache.lucene.util.UnicodeUtil;
 
 /**
  * An {@link Analyzer} used primarily at query time to wrap another analyzer and provide a layer of protection

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
index 48365ff..7311459 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
@@ -18,7 +18,6 @@
  */
 package org.apache.lucene.analysis.standard;
 
-import java.io.Reader;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 
 /**

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java
index ee0bf45..c7c5214 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.standard;
 import org.apache.lucene.analysis.util.TokenizerFactory;
 import org.apache.lucene.util.AttributeFactory;
 
-import java.io.Reader;
 import java.util.Map;
 
 /**

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java
index b9c5529..2488665 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.synonym;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
 import java.nio.charset.StandardCharsets;
@@ -39,7 +38,6 @@ import org.apache.lucene.analysis.util.ResourceLoader;
 import org.apache.lucene.analysis.util.ResourceLoaderAware;
 import org.apache.lucene.analysis.util.TokenFilterFactory;
 import org.apache.lucene.analysis.util.TokenizerFactory;
-import org.apache.lucene.util.Version;
 
 /**
  * Factory for {@link SynonymFilter}.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
index fea5b69..fc8703f 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
@@ -36,9 +36,7 @@ import org.apache.lucene.util.BytesRefBuilder;
 import org.apache.lucene.util.BytesRefHash;
 import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.CharsRefBuilder;
-import org.apache.lucene.util.IntsRef;
 import org.apache.lucene.util.IntsRefBuilder;
-import org.apache.lucene.util.UnicodeUtil;
 import org.apache.lucene.util.fst.ByteSequenceOutputs;
 import org.apache.lucene.util.fst.FST;
 import org.apache.lucene.util.fst.Util;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
index ba4010a..cd5ea3b 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
@@ -27,7 +27,6 @@ import org.apache.lucene.analysis.core.LowerCaseFilter;
 import org.apache.lucene.analysis.core.StopFilter;
 import org.apache.lucene.analysis.util.CharArraySet;
 import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
-import org.apache.lucene.util.Version;
 
 /**
  * {@link Analyzer} for Thai language. It uses {@link java.text.BreakIterator} to break words.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
index 539b203..c9ed471 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
@@ -30,7 +30,6 @@ import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
 import org.apache.lucene.analysis.util.CharArraySet;
 import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
-import org.apache.lucene.util.Version;
 import org.tartarus.snowball.ext.TurkishStemmer;
 
 /**

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
index ead4e35..4b662e9 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
@@ -26,7 +26,6 @@ import org.apache.lucene.util.AttributeFactory;
 import org.apache.lucene.util.AttributeSource;
 
 import java.io.IOException;
-import java.io.Reader;
 import java.util.*;
 
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java
index 08501b9..f7b15f6 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java
@@ -20,8 +20,6 @@ package org.apache.lucene.collation;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.KeywordTokenizer;
-import org.apache.lucene.util.Version;
-
 import java.text.Collator;
 
 /**

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
index 579943a..d60b5f2 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.util.Version;
 
 /**
  * Test the Arabic Analyzer

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java
index 03d13e3..a040901 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java
@@ -18,7 +18,6 @@ package org.apache.lucene.analysis.ar;
 
 
 import java.io.IOException;
-import java.io.Reader;
 import java.io.StringReader;
 
 import org.apache.lucene.analysis.Analyzer;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java
index 4b19c94..2cd8e84 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.bg;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java
index 6158b33..a05dd0b 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java
@@ -18,7 +18,6 @@ package org.apache.lucene.analysis.br;
 
 
 import java.io.IOException;
-import java.io.Reader;
 import java.io.StringReader;
 
 import org.apache.lucene.analysis.Analyzer;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java
index 75b3e87..bb5eff3 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.charfilter;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java
index d4882a9..a7e1422 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.cjk;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java
index 6231f3d..e8dd4cf 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.util.Version;
 
 /**
  * Test the Sorani analyzer

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java
index 510b83c..61ef7b4 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.ckb;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
index 409adf7..1171574 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.lucene.analysis.commongrams;
 
-import java.io.Reader;
 import java.io.StringReader;
 import java.util.Arrays;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java
index 7c826a9..776365e 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java
@@ -17,7 +17,6 @@
 package org.apache.lucene.analysis.commongrams;
 
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.TestStopFilter;
@@ -27,8 +26,6 @@ import org.apache.lucene.analysis.util.ClasspathResourceLoader;
 import org.apache.lucene.analysis.util.ResourceLoader;
 import org.apache.lucene.util.Version;
 
-import java.io.StringReader;
-
 /**
  * Tests pretty much copied from StopFilterFactoryTest We use the test files
  * used by the StopFilterFactoryTest TODO: consider creating separate test files

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
index d45b1e3..eeff4d6 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
@@ -32,7 +32,6 @@ import org.apache.lucene.index.PostingsEnum;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.MultiFields;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
index 5c25471..bf02ccd 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
@@ -42,7 +42,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java
index 5bf6ed0..df71a95 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.de;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
index 7bf8661..c0c522f 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
@@ -25,7 +25,6 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.Analyzer.TokenStreamComponents;
 import org.apache.lucene.analysis.core.KeywordTokenizer;
 import org.apache.lucene.analysis.core.LowerCaseFilter;
 import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java
index cedc9ab..d5c56fb 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.el;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java
index 13830e9..4a4f25f 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.el;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java
index e3dc81d..6c248b2 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.en;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java
index 79fa7cf..a4ad23c 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.en;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java
index a7739b2..ccb2e76 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.en;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
index 70f0a4f..7ecaca1 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.fa;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.util.Version;
 
 /**
  * Test the Persian Analyzer

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java
index 5bffb71..bb23571 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.fa;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java
index 15a2b96..eaf3c3c 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.fr;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java
index 6cd399b..820b5d0 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.fr;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java
index 2014936..4a106ef 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.ga;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java
index ddc60f0..a396130 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.gl;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java
index e02fc5c..270151a 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.gl;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
index 6fa1d7c..5b61686 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.hi;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.util.Version;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java
index 8caf700..7bf5f05 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java
@@ -21,9 +21,7 @@ import java.io.Reader;
 import java.io.StringReader;
 
 import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
-import org.apache.lucene.analysis.util.TokenizerFactory;
 
 /**
  * Simple tests to ensure the Hindi filter Factories are working.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
index 0462911..f4c0ba6 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
@@ -18,12 +18,8 @@ package org.apache.lucene.analysis.hi;
 
 
 import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.KeywordTokenizer;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java
index b595067..63f235b 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.hu;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java
index c72d033..8ee4c2f 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java
@@ -25,10 +25,8 @@ import java.nio.file.Path;
 import java.util.List;
 
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockDirectoryWrapper;
 import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
 
 /** Tests that &gt; 64k affixes actually works and doesnt overflow some internal int */
 public class Test64kAffixes extends LuceneTestCase {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52f5c502/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java
index e345e9d..c1a5e09 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java
@@ -23,7 +23,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockDirectoryWrapper;
 import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;