You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2019/03/26 20:35:52 UTC
[lucene-solr] branch jira/solr-9840 updated (5e1a2bf -> c7e2d8b)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a change to branch jira/solr-9840
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
discard 5e1a2bf SOLR-9840: Add a unit test for LDAP integration (Hrishikesh Gadre, Kevin Risden)
new 28c8171 SOLR-12732: TestLogWatcher failure on Jenkins. Deal with superclass logging bleeding into first watcher in the test
new b893548 SOLR-13268: Clean up any test failures resulting from defaulting to async logging. Put TestXmlQParser back
new 4582053 LUCENE-8712: Polygon2D does not detect crossings in some cases (#598)
new fd8d9d5 LUCENE-8713: Add Line2D tests
new c87e761 LUCENE-8652: ensure that the norm doesn't influence the score in TestSynonymQuery#testBoosts
new b1f870a LUCENE-8631: The Korean user dictionary now picks the longest-matching word and discards the other matches.
new b2c83de LUCENE-8652: remove unused import
new 9edc557 SOLR-12891 MacroExpander will no longer will expand URL parameters by default inside of the 'expr' parameter, add InjectionDefense class for safer handling of untrusted data in streaming expressions and add -DStreamingExpressionMacros system property to revert to legacy behavior
new c1bea96 LUCENE-8720: fix int overflow in NameIntCacheLRU
new cf88f54 Remove inadvertently included println
new d8f2a02 SOLR-13131 Category Routed Aliases
new 6d0386c SOLR-13234: Fix for turkish locales
new a18aa21 SOLR-12121: Remove a System.out.println in JWTAuthPlugin
new d19dcb4 LUCENE-8726: ValueSource.asDoubleValuesSource() could leak a reference to IndexSearcher
new 84785e8 LUCENE-8726: Changes entry
new 9096b84 LUCENE-8719: Traverse all paths at the end of a TokenStream in FixedShingleFilter
new 132a188 update doap files with the new release 8.0.0
new 2afa6cb Add 8.0.0 back compat test indexes and reenable backward compatibility tests for 9
new c2a6772 SOLR-13129: nested docs: add more/better documentation in Solr ref-guide
new ffb1fc8 Concurrently flush next buffer during commit in RandomIndexWriter (#607)
new fbd0516 LUCENE-3041: QueryVisitor (#581)
new 76babf8 SOLR-12923: Fix some issues w/concurrency and exception swallowing in SimClusterStateProvider/SimCloudManager
new 425f207 LUCENE-8688: Forced merges merge more than necessary.
new ad457d1 Improve RIW exception handling and opt out of concurrent flushing if exception is expected
new 571b307 SOLR-13292: Fix a logic bug when point types are present, add more details to the unit test.
new 8f29d1e SOLR-13244: Nodes view fails when a node is temporarily down
new c79aeee SOLR-12923: tweak the randomization in testCreateLargeSimCollections to reduce the max possible totalCores
new 1a54c6b SOLR-12923: fix SimClusterStateProvider to use lock.lockInterruptibly() exclusively, and make SimCloudManager's Callable checks tollerant of Callables that may have failed related to interrupts w/o explicitly throwing InterruptedException
new af5c2b2 Fix more tests to not use concurrent flushing in RIW#commit()
new 5c14302 SOLR-12923: Mea culpa: Remove useless import of java.lang... that breaks precommit
new 5ca2524 LUCENE-8694: Payload-filtered term intervals
new 3ac07b8 SOLR-13268: Patch that flushes when shutting down
new cf82816 SOLR-13330: Improve HDFS tests
new 577bef5 LUCENE-8166: Require merge instances to be consumed in the thread that created them.
new 07f3535 LUCENE-8138: Check that dv producers's next/advance and advanceExact impls are consistent.
new 9fea306 SOLR-8033: Remove debug if branch in HdfsTransactionLog
new 6f2b7bf SOLR-11127: REINDEXCOLLECTION command for re-indexing of existing collections.
new 5b7866b SOLR-12955: Refactored DistributedUpdateProcessor to put SolrCloud specifics into a subclass Closes #528
new 85a702c SOLR-13253: avoid using IndexSchema.getResourceLoader for non-schema things. Furthermore it's reference to SolrConfig was removed.
new 2a1ed6e LUCENE-8729: Workaround to allow compile under JDK13+
new 14175c4 LUCENE-8671: Load FST off-heap if reader is not opened from an index writer (#610)
new 6222abf SOLR-9079: Remove commons-lang as a dependency
new 65e1b3e Add assume to test since it only works with mmap directory
new 863d34b SOLR-13322: Properly log exceptions.
new bca22d5 SOLR-11126: Move change log entry under 8.0
new c60685f SOLR-13324 - Don't swallow/print exception in URLClassifyProcessor anymore
new dad414c SOLR-13323 - remove unused csv related classes/tests
new 0231c1e SOLR-13342: Remove dom4j from Solr
new 4e23038 SOLR-13335: Upgrade to velocity 2.0 and velocity-tools 3.0
new 11542ae Fix solr/CHANGES.txt
new 361d1e8 SOLR-13112: Upgrade jackson to 2.9.8
new 42a548e LUCENE-6687 - avoid unnecessary looping
new 65165c7 SOLR-11959: Add docs on CDCR limitation with Basic Auth
new 04afdb6 LUCENE-8735: Avoid FileAlreadyExistsException on windows. (#619)
new 8d7619f LUCENE-8735: fix changes entry after backport
new c7e2d8b SOLR-9840: Add a unit test for LDAP integration (Hrishikesh Gadre, Kevin Risden)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5e1a2bf)
\
N -- N -- N refs/heads/jira/solr-9840 (c7e2d8b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 31548 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-tools/doap/lucene.rdf | 5 +
dev-tools/doap/solr.rdf | 5 +
lucene/CHANGES.txt | 48 +
.../analysis/shingle/FixedShingleFilter.java | 94 +-
.../analysis/shingle/FixedShingleFilterTest.java | 17 +
.../apache/lucene/analysis/ko/KoreanTokenizer.java | 23 +-
.../lucene/analysis/ko/TestKoreanTokenizer.java | 14 +
.../org/apache/lucene/analysis/ko/userdict.txt | 7 +-
.../codecs/lucene70/Lucene70NormsProducer.java | 2 +-
.../lucene/index/TestBackwardsCompatibility.java | 43 +-
.../org/apache/lucene/index/dvupdates.8.0.0.zip | Bin 0 -> 13396 bytes
.../test/org/apache/lucene/index/empty.8.0.0.zip | Bin 0 -> 376 bytes
.../org/apache/lucene/index/index.8.0.0-cfs.zip | Bin 0 -> 15594 bytes
.../org/apache/lucene/index/index.8.0.0-nocfs.zip | Bin 0 -> 15593 bytes
.../org/apache/lucene/index/moreterms.8.0.0.zip | Bin 0 -> 82427 bytes
.../test/org/apache/lucene/index/sorted.8.0.0.zip | Bin 0 -> 133026 bytes
.../classification/utils/NearestFuzzyQuery.java | 6 +
.../codecs/memory/DirectDocValuesProducer.java | 4 +-
.../simpletext/SimpleTextCompoundFormat.java | 27 +-
lucene/common-build.xml | 5 +-
.../apache/lucene/codecs/DocValuesProducer.java | 5 +-
.../org/apache/lucene/codecs/FieldsProducer.java | 5 +-
.../org/apache/lucene/codecs/NormsProducer.java | 5 +-
.../org/apache/lucene/codecs/PointsReader.java | 5 +-
.../apache/lucene/codecs/StoredFieldsReader.java | 4 +-
.../apache/lucene/codecs/TermVectorsReader.java | 5 +-
.../codecs/blocktree/BlockTreeTermsReader.java | 2 +-
.../lucene/codecs/blocktree/FieldReader.java | 15 +-
.../codecs/lucene50/Lucene50CompoundReader.java | 6 +
.../codecs/lucene80/Lucene80NormsProducer.java | 83 +-
.../codecs/perfield/PerFieldDocValuesFormat.java | 4 +-
.../codecs/perfield/PerFieldPostingsFormat.java | 4 +-
.../org/apache/lucene/document/FeatureQuery.java | 22 +-
.../lucene/document/LatLonDocValuesBoxQuery.java | 8 +
.../document/LatLonDocValuesDistanceQuery.java | 8 +
.../document/LatLonPointDistanceFeatureQuery.java | 13 +-
.../lucene/document/LatLonPointDistanceQuery.java | 8 +
.../lucene/document/LatLonPointInPolygonQuery.java | 8 +
.../lucene/document/LongDistanceFeatureQuery.java | 13 +-
.../apache/lucene/document/RangeFieldQuery.java | 10 +-
.../document/SortedNumericDocValuesRangeQuery.java | 8 +
.../document/SortedSetDocValuesRangeQuery.java | 8 +
.../src/java/org/apache/lucene/geo/EdgeTree.java | 47 +-
.../src/java/org/apache/lucene/geo/GeoUtils.java | 23 +-
.../src/java/org/apache/lucene/geo/Polygon2D.java | 4 +-
.../java/org/apache/lucene/index/CheckIndex.java | 93 +-
.../apache/lucene/index/DefaultIndexingChain.java | 2 +-
.../org/apache/lucene/index/ReadersAndUpdates.java | 4 +-
.../apache/lucene/index/SegmentCoreReaders.java | 4 +-
.../org/apache/lucene/index/SegmentDocValues.java | 2 +-
.../org/apache/lucene/index/SegmentMerger.java | 2 +-
.../org/apache/lucene/index/SegmentReadState.java | 13 +-
.../org/apache/lucene/index/SegmentReader.java | 4 +-
.../lucene/index/StandardDirectoryReader.java | 4 +-
.../org/apache/lucene/index/TieredMergePolicy.java | 57 +-
.../org/apache/lucene/search/AutomatonQuery.java | 9 +-
.../org/apache/lucene/search/BlendedTermQuery.java | 11 +-
.../org/apache/lucene/search/BooleanQuery.java | 12 +
.../org/apache/lucene/search/BooleanWeight.java | 13 -
.../java/org/apache/lucene/search/BoostQuery.java | 5 +
.../apache/lucene/search/ConstantScoreQuery.java | 5 +
.../apache/lucene/search/ConstantScoreWeight.java | 9 -
.../apache/lucene/search/DisjunctionMaxQuery.java | 19 +-
.../lucene/search/DocValuesFieldExistsQuery.java | 7 +
.../lucene/search/DocValuesRewriteMethod.java | 7 +
.../apache/lucene/search/DoubleValuesSource.java | 5 +-
.../org/apache/lucene/search/FilterWeight.java | 7 -
.../java/org/apache/lucene/search/FuzzyQuery.java | 20 +-
.../org/apache/lucene/search/FuzzyTermsEnum.java | 62 +-
.../lucene/search/IndexOrDocValuesQuery.java | 14 +-
.../org/apache/lucene/search/LRUQueryCache.java | 6 -
.../apache/lucene/search/MatchAllDocsQuery.java | 5 +
.../org/apache/lucene/search/MatchNoDocsQuery.java | 11 +-
.../org/apache/lucene/search/MultiPhraseQuery.java | 21 +-
.../search/MultiTermQueryConstantScoreWrapper.java | 7 +
.../org/apache/lucene/search/NGramPhraseQuery.java | 5 +
.../lucene/search/NormsFieldExistsQuery.java | 7 +
.../java/org/apache/lucene/search/PhraseQuery.java | 19 +-
.../org/apache/lucene/search/PointInSetQuery.java | 7 +
.../org/apache/lucene/search/PointRangeQuery.java | 7 +
.../src/java/org/apache/lucene/search/Query.java | 6 +
.../org/apache/lucene/search/QueryVisitor.java | 94 ++
.../org/apache/lucene/search/SynonymQuery.java | 25 +-
.../org/apache/lucene/search/TermInSetQuery.java | 25 +-
.../java/org/apache/lucene/search/TermQuery.java | 13 +-
.../src/java/org/apache/lucene/search/Weight.java | 10 -
.../org/apache/lucene/search/package-info.java | 6 -
.../lucene/search/spans/FieldMaskingSpanQuery.java | 15 +-
.../apache/lucene/search/spans/SpanBoostQuery.java | 9 +
.../lucene/search/spans/SpanContainQuery.java | 31 +-
.../search/spans/SpanMultiTermQueryWrapper.java | 10 +-
.../apache/lucene/search/spans/SpanNearQuery.java | 31 +-
.../apache/lucene/search/spans/SpanNotQuery.java | 19 +-
.../apache/lucene/search/spans/SpanOrQuery.java | 21 +-
.../search/spans/SpanPositionCheckQuery.java | 15 +-
.../apache/lucene/search/spans/SpanTermQuery.java | 16 +-
.../apache/lucene/store/ByteBuffersDirectory.java | 7 +
.../java/org/apache/lucene/store/Directory.java | 5 +-
.../org/apache/lucene/store/FilterDirectory.java | 2 +-
.../codecs/lucene50/TestBlockPostingsFormat.java | 73 ++
...estLucene50StoredFieldsFormatMergeInstance.java | 14 +-
.../TestLucene80NormsFormatMergeInstance.java | 14 +-
.../apache/lucene/document/TestFeatureField.java | 26 -
.../test/org/apache/lucene/geo/TestPolygon2D.java | 30 +
.../test/org/apache/lucene/index/TestCodecs.java | 4 +-
.../lucene/index/TestDemoParallelLeafReader.java | 2 +-
.../src/test/org/apache/lucene/index/TestDoc.java | 6 +-
.../apache/lucene/index/TestDocumentWriter.java | 8 +-
.../org/apache/lucene/index/TestIndexWriter.java | 39 +
.../index/TestIndexWriterThreadsToSegments.java | 2 +-
.../apache/lucene/index/TestMultiTermsEnum.java | 2 +-
.../org/apache/lucene/index/TestSegmentMerger.java | 6 +-
.../org/apache/lucene/index/TestSegmentReader.java | 2 +-
.../apache/lucene/index/TestSegmentTermDocs.java | 6 +-
.../apache/lucene/index/TestTieredMergePolicy.java | 98 ++
.../apache/lucene/search/JustCompileSearch.java | 12 +-
.../lucene/search/TestBoolean2ScorerSupplier.java | 10 +-
.../org/apache/lucene/search/TestBooleanQuery.java | 45 +-
.../apache/lucene/search/TestBooleanScorer.java | 11 +-
.../apache/lucene/search/TestConjunctionDISI.java | 7 -
.../lucene/search/TestConstantScoreQuery.java | 22 +-
.../apache/lucene/search/TestLRUQueryCache.java | 31 +-
.../lucene/search/TestMaxScoreSumPropagator.java | 7 -
.../lucene/search/TestMultiTermQueryRewrites.java | 5 +
.../org/apache/lucene/search/TestNeedsScores.java | 5 +
.../org/apache/lucene/search/TestPrefixRandom.java | 5 +
.../apache/lucene/search/TestQueryRescorer.java | 10 +-
.../org/apache/lucene/search/TestQueryVisitor.java | 333 +++++
.../apache/lucene/search/TestRegexpRandom2.java | 7 +-
.../org/apache/lucene/search/TestScorerPerf.java | 7 +-
.../org/apache/lucene/search/TestSortRandom.java | 5 +
.../org/apache/lucene/search/TestSynonymQuery.java | 9 +-
.../TestUsageTrackingFilterCachingPolicy.java | 5 +
.../org/apache/lucene/search/TestWANDScorer.java | 5 +
.../search/spans/JustCompileSearchSpans.java | 6 +
.../search/spans/TestFieldMaskingSpanQuery.java | 13 +-
.../org/apache/lucene/facet/DrillDownQuery.java | 6 +
.../apache/lucene/facet/DrillSidewaysQuery.java | 11 +-
.../org/apache/lucene/facet/range/DoubleRange.java | 6 +
.../org/apache/lucene/facet/range/LongRange.java | 6 +
.../writercache/LruTaxonomyWriterCache.java | 2 +-
.../taxonomy/writercache/NameIntCacheLRU.java | 4 +-
.../org/apache/lucene/facet/TestDrillSideways.java | 6 +
.../lucene/facet/range/TestRangeFacetCounts.java | 6 +
.../search/highlight/QueryTermExtractor.java | 90 +-
.../highlight/WeightedSpanTermExtractor.java | 7 +-
.../uhighlight/MemoryIndexOffsetStrategy.java | 13 +-
.../search/uhighlight/MultiTermHighlighting.java | 236 ++--
.../lucene/search/uhighlight/OffsetsEnum.java | 27 +-
.../lucene/search/uhighlight/PhraseHelper.java | 33 +-
.../search/uhighlight/UnifiedHighlighter.java | 23 +-
.../lucene/search/highlight/HighlighterTest.java | 6 +
.../highlight/custom/HighlightCustomQueryTest.java | 16 +-
.../uhighlight/TestUnifiedHighlighterMTQ.java | 17 +-
.../TestUnifiedHighlighterStrictPhrases.java | 6 +
.../search/vectorhighlight/FieldQueryTest.java | 8 +
lucene/ivy-versions.properties | 15 +-
.../lucene/search/join/GlobalOrdinalsQuery.java | 10 +-
.../search/join/GlobalOrdinalsWithScoreQuery.java | 10 +-
.../search/join/ParentChildrenBlockJoinQuery.java | 13 +-
.../search/join/PointInSetIncludingScoreQuery.java | 14 +-
.../search/join/TermsIncludingScoreQuery.java | 13 +-
.../org/apache/lucene/search/join/TermsQuery.java | 6 +
.../lucene/search/join/ToChildBlockJoinQuery.java | 9 +-
.../lucene/search/join/ToParentBlockJoinQuery.java | 6 +
.../apache/lucene/search/join/TestBlockJoin.java | 33 +-
.../apache/lucene/search/join/TestJoinUtil.java | 16 +-
.../search/TestDiversifiedTopDocsCollector.java | 13 +-
.../apache/lucene/queries/CommonTermsQuery.java | 12 +-
.../queries/function/FunctionMatchQuery.java | 6 +
.../lucene/queries/function/FunctionQuery.java | 12 +-
.../queries/function/FunctionRangeQuery.java | 13 +-
.../queries/function/FunctionScoreQuery.java | 18 +-
.../lucene/queries/function/ValueSource.java | 14 +-
.../apache/lucene/queries/mlt/MoreLikeThis.java | 16 +-
.../lucene/queries/mlt/MoreLikeThisQuery.java | 18 +-
.../lucene/queries/payloads/PayloadScoreQuery.java | 13 +-
.../queries/payloads/SpanPayloadCheckQuery.java | 16 +-
.../lucene/queries/function/TestValueSources.java | 52 +-
.../lucene/queries/mlt/TestMoreLikeThis.java | 193 ++-
.../complexPhrase/ComplexPhraseQueryParser.java | 6 +
.../surround/query/DistanceRewriteQuery.java | 8 +
.../surround/query/SimpleTermRewriteQuery.java | 14 +-
.../queryparser/classic/TestMultiAnalyzer.java | 17 +-
.../apache/lucene/document/LatLonShapeQuery.java | 8 +
.../src/java/org/apache/lucene/geo/Line2D.java | 20 +-
.../lucene/sandbox/queries/FuzzyLikeThisQuery.java | 8 +-
.../java/org/apache/lucene/search/BM25FQuery.java | 14 +-
.../org/apache/lucene/search/CoveringQuery.java | 17 +-
.../lucene/search/DocValuesNumbersQuery.java | 8 +
.../apache/lucene/search/DocValuesTermsQuery.java | 9 +-
.../apache/lucene/search/TermAutomatonQuery.java | 23 +-
.../intervals/ConjunctionIntervalsSource.java | 10 +-
.../intervals/DifferenceIntervalsSource.java | 10 +-
.../intervals/DisjunctionIntervalsSource.java | 11 +-
.../search/intervals/ExtendedIntervalsSource.java | 7 +-
.../search/intervals/FilteredIntervalsSource.java | 7 +-
.../intervals/FixedFieldIntervalsSource.java | 7 +-
.../lucene/search/intervals/IntervalQuery.java | 15 +-
.../apache/lucene/search/intervals/Intervals.java | 17 +
.../lucene/search/intervals/IntervalsSource.java | 9 +-
.../MinimumShouldMatchIntervalsSource.java | 10 +-
.../search/intervals/MultiTermIntervalsSource.java | 5 +-
.../search/intervals/OffsetIntervalsSource.java | 7 +-
...ava => PayloadFilteredTermIntervalsSource.java} | 103 +-
.../search/intervals/TermIntervalsSource.java | 6 +-
.../idversion/TestIDVersionPostingsFormat.java | 16 +-
.../lucene/document/BaseLatLonShapeTestCase.java | 2 +-
.../apache/lucene/document/TestLatLonShape.java | 27 +-
.../src/test/org/apache/lucene/geo/TestLine2D.java | 85 ++
.../sandbox/queries/FuzzyLikeThisQueryTest.java | 16 +-
.../lucene/search/TestTermAutomatonQuery.java | 5 +
.../intervals/TestPayloadFilteredInterval.java | 85 ++
.../spatial/composite/CompositeVerifyQuery.java | 6 +
.../composite/IntersectsRPTVerifyQuery.java | 6 +
.../spatial/prefix/AbstractPrefixTreeQuery.java | 8 +
.../spatial/serialized/SerializedDVStrategy.java | 6 +
.../lucene/spatial/vector/PointVectorStrategy.java | 6 +
.../lucene/spatial3d/PointInGeo3DShapeQuery.java | 8 +
.../suggest/document/CompletionFieldsProducer.java | 2 +-
.../search/suggest/document/CompletionWeight.java | 7 -
.../search/suggest/document/ContextQuery.java | 6 +
.../suggest/document/PrefixCompletionQuery.java | 5 +
.../suggest/document/RegexCompletionQuery.java | 6 +
.../suggest/document/TestContextSuggestField.java | 4 +-
.../lucene/codecs/asserting/AssertingCodec.java | 8 +
.../codecs/asserting/AssertingDocValuesFormat.java | 27 +-
.../codecs/asserting/AssertingNormsFormat.java | 15 +-
.../codecs/asserting/AssertingPointsFormat.java | 15 +-
.../codecs/asserting/AssertingPostingsFormat.java | 2 +-
.../asserting/AssertingStoredFieldsFormat.java | 16 +-
.../asserting/AssertingTermVectorsFormat.java | 2 +-
.../apache/lucene/index/AssertingLeafReader.java | 11 +-
.../lucene/index/BaseIndexFileFormatTestCase.java | 28 +-
.../lucene/index/BaseMergePolicyTestCase.java | 12 +-
.../lucene/index/BaseNormsFormatTestCase.java | 77 +-
.../index/BaseStoredFieldsFormatTestCase.java | 24 +-
.../apache/lucene/index/MergingCodecReader.java | 75 ++
.../index/MergingDirectoryReaderWrapper.java | 50 +
.../org/apache/lucene/index/RandomIndexWriter.java | 80 +-
.../apache/lucene/index/RandomPostingsTester.java | 2 +-
.../org/apache/lucene/search/AssertingQuery.java | 5 +
.../lucene/search/BlockScoreQueryWrapper.java | 12 +-
.../java/org/apache/lucene/search/QueryUtils.java | 3 +
.../lucene/search/RandomApproximationQuery.java | 7 +-
.../lucene/search/ShardSearchingTestBase.java | 5 +-
.../lucene/search/spans/AssertingSpanQuery.java | 12 +-
.../lucene/search/spans/AssertingSpanWeight.java | 7 -
.../org/apache/lucene/util/LuceneTestCase.java | 21 +-
.../tools/src/groovy/check-source-patterns.groovy | 4 +-
solr/CHANGES.txt | 92 +-
.../legacy/LegacyAbstractAnalyticsTest.java | 2 +-
.../handler/clustering/ClusteringComponent.java | 2 +-
.../clustering/carrot2/CarrotClusteringEngine.java | 10 +-
.../java/org/apache/solr/ltr/LTRScoringQuery.java | 15 +-
.../java/org/apache/solr/ltr/feature/Feature.java | 13 +-
.../solr/ltr/feature/OriginalScoreFeature.java | 7 -
.../org/apache/solr/ltr/feature/SolrFeature.java | 9 -
.../test/org/apache/solr/ltr/TestRerankBase.java | 3 +-
.../exporter/SolrExporterIntegrationTest.java | 12 +-
solr/contrib/velocity/ivy.xml | 10 +-
.../solr/response/SolrParamResourceLoader.java | 18 +-
.../apache/solr/response/SolrVelocityLogger.java | 114 --
.../solr/response/SolrVelocityResourceLoader.java | 10 +-
.../solr/response/VelocityResponseWriter.java | 29 +-
solr/contrib/velocity/src/resources/_macros.vm | 4 +-
.../velocity/src/resources/velocity/footer.vm | 2 +-
.../solr/velocity/VelocityResponseWriterTest.java | 11 +-
solr/core/ivy.xml | 3 +-
.../apache/solr/cloud/ExclusiveSliceProperty.java | 2 +-
.../src/java/org/apache/solr/cloud/Overseer.java | 136 +-
.../java/org/apache/solr/cloud/ZkController.java | 2 +-
.../solr/cloud/api/collections/AddReplicaCmd.java | 2 +-
.../solr/cloud/api/collections/AliasCmd.java | 108 ++
.../cloud/api/collections/CategoryRoutedAlias.java | 265 ++++
.../solr/cloud/api/collections/CreateAliasCmd.java | 76 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 2 +-
.../MaintainCategoryRoutedAliasCmd.java | 183 +++
...iasCmd.java => MaintainTimeRoutedAliasCmd.java} | 87 +-
.../OverseerCollectionMessageHandler.java | 79 +-
.../api/collections/ReindexCollectionCmd.java | 824 ++++++++++++
.../solr/cloud/api/collections/RoutedAlias.java | 145 +++
.../cloud/api/collections/TimeRoutedAlias.java | 393 +++++-
.../apache/solr/cloud/overseer/ReplicaMutator.java | 2 +-
.../java/org/apache/solr/core/CoreContainer.java | 121 +-
.../java/org/apache/solr/core/CoreDescriptor.java | 2 +-
.../org/apache/solr/core/HdfsDirectoryFactory.java | 2 +-
.../src/java/org/apache/solr/core/SolrCore.java | 2 +-
.../solr/handler/AnalysisRequestHandlerBase.java | 2 +-
.../org/apache/solr/handler/StreamHandler.java | 4 +-
.../org/apache/solr/handler/admin/ColStatus.java | 3 +
.../solr/handler/admin/CollectionsHandler.java | 90 +-
.../solr/handler/admin/ConfigSetsHandler.java | 2 +-
.../solr/handler/admin/CoreAdminHandler.java | 2 +-
.../solr/handler/admin/CoreAdminOperation.java | 2 +-
.../solr/handler/admin/MetricsHistoryHandler.java | 4 +-
.../solr/handler/admin/RebalanceLeaders.java | 2 +-
.../handler/admin/SegmentsInfoRequestHandler.java | 5 +-
.../solr/handler/component/FacetComponent.java | 4 +-
.../handler/component/HttpShardHandlerFactory.java | 2 +-
.../apache/solr/handler/component/StatsField.java | 2 +-
.../apache/solr/internal/csv/writer/CSVConfig.java | 283 -----
.../solr/internal/csv/writer/CSVConfigGuesser.java | 185 ---
.../apache/solr/internal/csv/writer/CSVField.java | 108 --
.../apache/solr/internal/csv/writer/CSVWriter.java | 132 --
.../solr/legacy/LegacyNumericRangeQuery.java | 8 +-
.../apache/solr/parser/SolrQueryParserBase.java | 8 +-
.../java/org/apache/solr/query/FilterQuery.java | 5 +
.../java/org/apache/solr/query/SolrRangeQuery.java | 8 +-
.../solr/request/SubstringBytesRefFilter.java | 2 +-
.../apache/solr/request/macro/MacroExpander.java | 13 +-
.../java/org/apache/solr/schema/IndexSchema.java | 37 +-
.../org/apache/solr/schema/IndexSchemaFactory.java | 12 +-
.../java/org/apache/solr/schema/LatLonType.java | 7 +
.../org/apache/solr/schema/ManagedIndexSchema.java | 30 +-
.../solr/schema/ManagedIndexSchemaFactory.java | 23 +-
.../java/org/apache/solr/schema/SchemaManager.java | 6 +-
.../apache/solr/search/AbstractReRankQuery.java | 6 +
.../org/apache/solr/search/AnalyticsQuery.java | 8 +-
.../solr/search/CollapsingQParserPlugin.java | 8 +-
.../apache/solr/search/ExportQParserPlugin.java | 6 +
.../src/java/org/apache/solr/search/Filter.java | 11 +-
.../solr/search/GraphTermsQParserPlugin.java | 20 +-
.../src/java/org/apache/solr/search/Grouping.java | 2 +-
.../org/apache/solr/search/HashQParserPlugin.java | 6 +
.../org/apache/solr/search/JoinQParserPlugin.java | 6 +
.../apache/solr/search/SolrConstantScoreQuery.java | 6 +
.../org/apache/solr/search/SolrCoreParser.java | 2 +-
.../org/apache/solr/search/SolrIndexSearcher.java | 5 +
.../apache/solr/search/SwitchQParserPlugin.java | 2 +-
.../java/org/apache/solr/search/WrappedQuery.java | 10 +-
.../solr/search/join/BlockJoinFacetFilter.java | 6 +
.../org/apache/solr/search/join/GraphQuery.java | 14 +-
.../solr/search/join/ScoreJoinQParserPlugin.java | 6 +
.../apache/solr/search/stats/ExactStatsCache.java | 34 +-
.../org/apache/solr/security/JWTAuthPlugin.java | 3 +-
.../apache/solr/security/PrintWriterWrapper.java | 10 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 2 +-
.../apache/solr/servlet/LoadAdminUiServlet.java | 10 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 2 +-
.../org/apache/solr/store/hdfs/HdfsDirectory.java | 9 +-
.../apache/solr/update/DeleteByQueryWrapper.java | 13 +-
.../org/apache/solr/update/HdfsTransactionLog.java | 3 -
.../org/apache/solr/update/SolrIndexConfig.java | 15 +-
.../org/apache/solr/update/SolrIndexSplitter.java | 6 +
.../solr/update/processor/CdcrUpdateProcessor.java | 2 +-
.../ConcatFieldUpdateProcessorFactory.java | 2 +-
.../processor/DistributedUpdateProcessor.java | 1307 ++------------------
.../DistributedUpdateProcessorFactory.java | 11 +-
.../processor/DistributedZkUpdateProcessor.java | 1235 ++++++++++++++++++
.../DocBasedVersionConstraintsProcessor.java | 3 +-
.../ParseDateFieldUpdateProcessorFactory.java | 4 +-
.../ParseNumericFieldUpdateProcessorFactory.java | 2 +-
.../processor/RoutedAliasUpdateProcessor.java | 252 ++++
.../SkipExistingDocumentsProcessorFactory.java | 3 +-
.../StatelessScriptUpdateProcessorFactory.java | 3 +-
.../processor/TimeRoutedAliasUpdateProcessor.java | 507 --------
.../update/processor/URLClassifyProcessor.java | 41 +-
.../processor/UUIDUpdateProcessorFactory.java | 2 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 6 +-
.../org/apache/solr/util/StartupLoggingUtils.java | 34 +-
.../java/org/apache/solr/util/TestInjection.java | 35 +
.../solr/collection1/conf/solrconfig-minhash.xml | 4 +-
.../solr/collection1/conf/solrconfig.xml | 4 +-
.../org/apache/solr/TestDistributedSearch.java | 2 +-
.../apache/solr/cloud/BasicDistributedZkTest.java | 7 +-
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 30 +-
.../apache/solr/cloud/CreateRoutedAliasTest.java | 2 +-
.../solr/cloud/DistribJoinFromCollectionTest.java | 3 +-
.../cloud/LeaderFailureAfterFreshStartTest.java | 2 +-
.../solr/cloud/MoveReplicaHDFSFailoverTest.java | 5 -
.../org/apache/solr/cloud/MoveReplicaHDFSTest.java | 4 -
.../apache/solr/cloud/PeerSyncReplicationTest.java | 2 +-
.../apache/solr/cloud/ReindexCollectionTest.java | 379 ++++++
.../org/apache/solr/cloud/SSLMigrationTest.java | 2 +-
.../solr/cloud/SystemCollectionCompatTest.java | 208 ++++
.../org/apache/solr/cloud/TestCloudPivotFacet.java | 3 +-
.../solr/cloud/TestCloudPseudoReturnFields.java | 5 +-
.../apache/solr/cloud/UnloadDistributedZkTest.java | 38 +-
.../collections/CollectionTooManyReplicasTest.java | 3 +-
.../HdfsCollectionsAPIDistributedZkTest.java | 4 -
.../api/collections/ReplicaPropertiesBase.java | 2 +-
.../collections/TestHdfsCloudBackupRestore.java | 1 -
.../HdfsAutoAddReplicasIntegrationTest.java | 6 -
.../cloud/autoscaling/sim/SimCloudManager.java | 90 +-
.../autoscaling/sim/SimClusterStateProvider.java | 448 ++++---
.../autoscaling/sim/SimSolrCloudTestCase.java | 22 +-
.../autoscaling/sim/TestSimExtremeIndexing.java | 4 +-
.../cloud/autoscaling/sim/TestSimLargeCluster.java | 37 +
.../solr/cloud/hdfs/HDFSCollectionsAPITest.java | 5 -
.../cloud/hdfs/HdfsBasicDistributedZkTest.java | 2 -
.../solr/cloud/hdfs/HdfsRecoverLeaseTest.java | 6 +-
.../apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java | 16 +-
.../cloud/hdfs/HdfsRestartWhileUpdatingTest.java | 10 +-
.../org/apache/solr/cloud/hdfs/HdfsTestUtil.java | 104 +-
.../apache/solr/cloud/hdfs/HdfsThreadLeakTest.java | 43 +-
.../HdfsTlogReplayBufferedWhileIndexingTest.java | 6 +-
.../cloud/hdfs/HdfsUnloadDistributedZkTest.java | 4 +-
.../hdfs/HdfsWriteToMultipleCollectionsTest.java | 7 +-
.../org/apache/solr/cloud/hdfs/StressHdfsTest.java | 1 -
.../apache/solr/core/HdfsDirectoryFactoryTest.java | 68 +-
.../test/org/apache/solr/core/TestLazyCores.java | 3 +-
.../handler/AnalysisRequestHandlerTestBase.java | 2 +-
.../solr/handler/TestHdfsBackupRestoreCore.java | 22 +-
.../solr/handler/XmlUpdateRequestHandlerTest.java | 8 +-
.../component/DistributedDebugComponentTest.java | 3 +-
.../apache/solr/handler/tagger/TaggerTestCase.java | 4 +-
.../apache/solr/index/hdfs/CheckHdfsIndexTest.java | 24 +-
.../internal/csv/writer/CSVConfigGuesserTest.java | 87 --
.../solr/internal/csv/writer/CSVConfigTest.java | 98 --
.../solr/internal/csv/writer/CSVFieldTest.java | 46 -
.../solr/internal/csv/writer/CSVWriterTest.java | 54 -
.../org/apache/solr/logging/TestLogWatcher.java | 63 +-
.../solr/request/macro/TestMacroExpander.java | 25 +
.../apache/solr/schema/TestSortableTextField.java | 2 +-
.../apache/solr/search/RankQueryTestPlugin.java | 6 +
.../apache/solr/search/TestPseudoReturnFields.java | 6 +-
.../org/apache/solr/search/TestRecoveryHdfs.java | 62 +-
.../org/apache/solr/search/TestXmlQParser.java | 55 +
.../search/facet/TestCloudJSONFacetJoinDomain.java | 3 +-
.../solr/search/facet/TestCloudJSONFacetSKG.java | 4 +-
.../solr/uninverting/TestFieldCacheSortRandom.java | 8 +-
.../org/apache/solr/update/AddBlockUpdateTest.java | 303 +++--
.../org/apache/solr/update/TestHdfsUpdateLog.java | 7 +-
.../AtomicUpdateProcessorFactoryTest.java | 2 +-
.../CategoryRoutedAliasUpdateProcessorTest.java | 476 +++++++
.../processor/DistributedUpdateProcessorTest.java | 4 +-
.../processor/RoutedAliasUpdateProcessorTest.java | 308 +++++
.../TimeRoutedAliasUpdateProcessorTest.java | 332 +----
solr/example/files/conf/velocity/hit.vm | 2 +-
solr/example/files/conf/velocity/macros.vm | 4 +-
solr/licenses/commons-lang-2.6.jar.sha1 | 1 -
solr/licenses/commons-lang-LICENSE-ASL.txt | 202 ---
solr/licenses/commons-lang-NOTICE.txt | 5 -
solr/licenses/commons-text-1.4.jar.sha1 | 1 -
solr/licenses/commons-text-1.6.jar.sha1 | 1 +
solr/licenses/dom4j-1.6.1.jar.sha1 | 1 -
solr/licenses/dom4j-LICENSE-BSD_LIKE.txt | 40 -
solr/licenses/dom4j-NOTICE.txt | 1 -
solr/licenses/jackcess-LICENSE-ASL.txt | 305 -----
solr/licenses/jackcess-encrypt-LICENSE-ASL.txt | 305 -----
solr/licenses/jackson-annotations-2.9.6.jar.sha1 | 1 -
solr/licenses/jackson-annotations-2.9.8.jar.sha1 | 1 +
solr/licenses/jackson-core-2.9.6.jar.sha1 | 1 -
solr/licenses/jackson-core-2.9.8.jar.sha1 | 1 +
solr/licenses/jackson-databind-2.9.6.jar.sha1 | 1 -
solr/licenses/jackson-databind-2.9.8.jar.sha1 | 1 +
.../jackson-dataformat-smile-2.9.6.jar.sha1 | 1 -
.../jackson-dataformat-smile-2.9.8.jar.sha1 | 1 +
solr/licenses/poi-LICENSE-ASL.txt | 480 +++----
solr/licenses/poi-NOTICE.txt | 23 +-
solr/licenses/poi-ooxml-LICENSE-ASL.txt | 480 +++----
solr/licenses/poi-ooxml-NOTICE.txt | 23 +-
solr/licenses/poi-ooxml-schemas-LICENSE-ASL.txt | 480 +++----
solr/licenses/poi-ooxml-schemas-NOTICE.txt | 23 +-
solr/licenses/poi-scratchpad-LICENSE-ASL.txt | 480 +++----
solr/licenses/poi-scratchpad-NOTICE.txt | 23 +-
solr/licenses/velocity-1.7.jar.sha1 | 1 -
solr/licenses/velocity-engine-core-2.0.jar.sha1 | 1 +
...SL.txt => velocity-engine-core-LICENSE-ASL.txt} | 0
...-NOTICE.txt => velocity-engine-core-NOTICE.txt} | 0
solr/licenses/velocity-tools-2.0.jar.sha1 | 1 -
solr/licenses/velocity-tools-generic-3.0.jar.sha1 | 1 +
....txt => velocity-tools-generic-LICENSE-ASL.txt} | 0
...OTICE.txt => velocity-tools-generic-NOTICE.txt} | 0
solr/licenses/velocity-tools-view-3.0.jar.sha1 | 1 +
...ASL.txt => velocity-tools-view-LICENSE-ASL.txt} | 0
...s-NOTICE.txt => velocity-tools-view-NOTICE.txt} | 0
solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1 | 1 +
...txt => velocity-tools-view-jsp-LICENSE-ASL.txt} | 0
...TICE.txt => velocity-tools-view-jsp-NOTICE.txt} | 0
.../conf/velocity/VM_global_library.vm | 10 +-
.../conf/velocity/did_you_mean.vm | 2 +-
.../conf/velocity/footer.vm | 4 +-
.../conf/velocity/richtext_doc.vm | 2 +-
solr/solr-ref-guide/build.xml | 2 +-
solr/solr-ref-guide/src/_config.yml.template | 2 +-
solr/solr-ref-guide/src/aliases.adoc | 267 ++++
solr/solr-ref-guide/src/blockjoin-faceting.adoc | 2 +-
solr/solr-ref-guide/src/cdcr-architecture.adoc | 2 +
solr/solr-ref-guide/src/collections-api.adoc | 180 ++-
solr/solr-ref-guide/src/distributed-requests.adoc | 1 +
solr/solr-ref-guide/src/how-solrcloud-works.adoc | 4 +-
.../src/indexing-and-basic-data-operations.adoc | 15 +-
.../src/indexing-nested-documents.adoc | 151 +++
solr/solr-ref-guide/src/json-facet-api.adoc | 2 +-
.../src/json-faceting-domain-changes.adoc | 2 +-
solr/solr-ref-guide/src/other-parsers.adoc | 2 +-
.../src/searching-nested-documents.adoc | 202 +++
solr/solr-ref-guide/src/searching.adoc | 2 +
solr/solr-ref-guide/src/streaming-expressions.adoc | 12 +-
solr/solr-ref-guide/src/time-routed-aliases.adoc | 119 --
.../src/transforming-and-indexing-custom-json.adoc | 100 --
.../src/transforming-result-documents.adoc | 6 +-
.../src/uploading-data-with-index-handlers.adoc | 102 --
.../src/velocity-response-writer.adoc | 1 -
.../java/org/apache/solr/client/solrj/io/Lang.java | 2 +-
.../solr/client/solrj/io/stream/DaemonStream.java | 13 +-
.../solr/client/solrj/io/stream/NoOpStream.java | 107 ++
.../stream/expr/InjectedExpressionException.java} | 11 +-
.../solrj/io/stream/expr/InjectionDefense.java | 198 +++
.../io/stream/expr/StreamExpressionParser.java | 116 +-
.../solrj/request/CollectionAdminRequest.java | 166 ++-
.../solr/common/cloud/CompositeIdRouter.java | 5 +
.../org/apache/solr/common/cloud/DocRouter.java | 1 +
.../solr/common/cloud/ImplicitDocRouter.java | 5 +
.../apache/solr/common/cloud/PlainIdRouter.java | 5 +
.../solr/common/params/CollectionParams.java | 7 +-
.../java/org/apache/solr/common/util/Utils.java | 4 +-
.../resources/apispec/collections.Commands.json | 8 +
.../solr/client/solrj/impl/HttpClientUtilTest.java | 2 +-
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../solrj/io/stream/StreamExpressionTest.java | 109 +-
.../solrj/io/stream/expr/InjectionDefenseTest.java | 115 ++
.../solr/common/util/TestJsonRecordReader.java | 2 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 11 +
solr/webapp/web/css/angular/cloud.css | 11 +
solr/webapp/web/js/angular/controllers/cloud.js | 27 +-
solr/webapp/web/partials/cloud.html | 90 +-
519 files changed, 12720 insertions(+), 8093 deletions(-)
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.8.0.0.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/empty.8.0.0.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.0.0-cfs.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.0.0-nocfs.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/moreterms.8.0.0.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.8.0.0.zip
create mode 100644 lucene/core/src/java/org/apache/lucene/search/QueryVisitor.java
copy solr/core/src/java/org/apache/solr/internal/csv/writer/package-info.java => lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatMergeInstance.java (73%)
copy solr/core/src/java/org/apache/solr/internal/csv/writer/package-info.java => lucene/core/src/test/org/apache/lucene/codecs/lucene80/TestLucene80NormsFormatMergeInstance.java (74%)
create mode 100644 lucene/core/src/test/org/apache/lucene/search/TestQueryVisitor.java
copy lucene/sandbox/src/java/org/apache/lucene/search/intervals/{TermIntervalsSource.java => PayloadFilteredTermIntervalsSource.java} (63%)
create mode 100644 lucene/sandbox/src/test/org/apache/lucene/geo/TestLine2D.java
create mode 100644 lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestPayloadFilteredInterval.java
create mode 100644 lucene/test-framework/src/java/org/apache/lucene/index/MergingCodecReader.java
create mode 100644 lucene/test-framework/src/java/org/apache/lucene/index/MergingDirectoryReaderWrapper.java
delete mode 100644 solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityLogger.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/api/collections/CategoryRoutedAlias.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/api/collections/MaintainCategoryRoutedAliasCmd.java
rename solr/core/src/java/org/apache/solr/cloud/api/collections/{MaintainRoutedAliasCmd.java => MaintainTimeRoutedAliasCmd.java} (70%)
create mode 100644 solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
create mode 100644 solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
delete mode 100644 solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java
delete mode 100644 solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java
delete mode 100644 solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java
delete mode 100644 solr/core/src/java/org/apache/solr/internal/csv/writer/CSVWriter.java
create mode 100644 solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
create mode 100644 solr/core/src/java/org/apache/solr/update/processor/RoutedAliasUpdateProcessor.java
delete mode 100644 solr/core/src/java/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessor.java
create mode 100644 solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
create mode 100644 solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
delete mode 100644 solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigGuesserTest.java
delete mode 100644 solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigTest.java
delete mode 100644 solr/core/src/test/org/apache/solr/internal/csv/writer/CSVFieldTest.java
delete mode 100644 solr/core/src/test/org/apache/solr/internal/csv/writer/CSVWriterTest.java
create mode 100644 solr/core/src/test/org/apache/solr/search/TestXmlQParser.java
create mode 100644 solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java
create mode 100644 solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
delete mode 100644 solr/licenses/commons-lang-2.6.jar.sha1
delete mode 100644 solr/licenses/commons-lang-LICENSE-ASL.txt
delete mode 100644 solr/licenses/commons-lang-NOTICE.txt
delete mode 100644 solr/licenses/commons-text-1.4.jar.sha1
create mode 100644 solr/licenses/commons-text-1.6.jar.sha1
delete mode 100644 solr/licenses/dom4j-1.6.1.jar.sha1
delete mode 100644 solr/licenses/dom4j-LICENSE-BSD_LIKE.txt
delete mode 100644 solr/licenses/dom4j-NOTICE.txt
delete mode 100644 solr/licenses/jackson-annotations-2.9.6.jar.sha1
create mode 100644 solr/licenses/jackson-annotations-2.9.8.jar.sha1
delete mode 100644 solr/licenses/jackson-core-2.9.6.jar.sha1
create mode 100644 solr/licenses/jackson-core-2.9.8.jar.sha1
delete mode 100644 solr/licenses/jackson-databind-2.9.6.jar.sha1
create mode 100644 solr/licenses/jackson-databind-2.9.8.jar.sha1
delete mode 100644 solr/licenses/jackson-dataformat-smile-2.9.6.jar.sha1
create mode 100644 solr/licenses/jackson-dataformat-smile-2.9.8.jar.sha1
delete mode 100644 solr/licenses/velocity-1.7.jar.sha1
create mode 100644 solr/licenses/velocity-engine-core-2.0.jar.sha1
rename solr/licenses/{velocity-LICENSE-ASL.txt => velocity-engine-core-LICENSE-ASL.txt} (100%)
rename solr/licenses/{velocity-NOTICE.txt => velocity-engine-core-NOTICE.txt} (100%)
delete mode 100644 solr/licenses/velocity-tools-2.0.jar.sha1
create mode 100644 solr/licenses/velocity-tools-generic-3.0.jar.sha1
copy solr/licenses/{velocity-tools-LICENSE-ASL.txt => velocity-tools-generic-LICENSE-ASL.txt} (100%)
copy solr/licenses/{velocity-tools-NOTICE.txt => velocity-tools-generic-NOTICE.txt} (100%)
create mode 100644 solr/licenses/velocity-tools-view-3.0.jar.sha1
copy solr/licenses/{velocity-tools-LICENSE-ASL.txt => velocity-tools-view-LICENSE-ASL.txt} (100%)
copy solr/licenses/{velocity-tools-NOTICE.txt => velocity-tools-view-NOTICE.txt} (100%)
create mode 100644 solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1
rename solr/licenses/{velocity-tools-LICENSE-ASL.txt => velocity-tools-view-jsp-LICENSE-ASL.txt} (100%)
rename solr/licenses/{velocity-tools-NOTICE.txt => velocity-tools-view-jsp-NOTICE.txt} (100%)
create mode 100644 solr/solr-ref-guide/src/aliases.adoc
create mode 100644 solr/solr-ref-guide/src/indexing-nested-documents.adoc
create mode 100644 solr/solr-ref-guide/src/searching-nested-documents.adoc
delete mode 100644 solr/solr-ref-guide/src/time-routed-aliases.adoc
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/NoOpStream.java
rename solr/{core/src/java/org/apache/solr/internal/csv/writer/package-info.java => solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/InjectedExpressionException.java} (81%)
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/InjectionDefense.java
create mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/InjectionDefenseTest.java