You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2020/01/27 11:37:36 UTC

[lucene-solr] 02/02: Merge branch 'master' into gradle-master

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 961e5e4565b722d0b74b38de12508485c5106b07
Merge: e2e5940 6bde0f3
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Mon Jan 27 12:37:19 2020 +0100

    Merge branch 'master' into gradle-master

 gradle/generation/jflex.gradle                     |  2 +-
 gradle/testing/defaults-tests.gradle               |  1 +
 gradle/validation/owasp-dependency-check.gradle    |  2 +
 lucene/CHANGES.txt                                 |  3 ++
 .../lucene/analysis/core/WhitespaceAnalyzer.java   | 15 ++++++-
 .../lucene/analysis/core/WhitespaceTokenizer.java  | 12 ++++++
 .../analysis/core/TestWhitespaceAnalyzer.java      | 49 ++++++++++++++++++++++
 .../lucene/codecs/uniformsplit/package-info.java   |  1 -
 .../uniformsplit/sharedterms/package-info.java     |  1 -
 .../org/apache/lucene/document/ShapeField.java     |  1 -
 .../apache/lucene/geo/SimpleWKTShapeParser.java    | 24 +++++------
 .../lucene/analysis/TestAnalyzerWrapper.java       |  1 +
 .../codecs/lucene60/TestLucene60PointsFormat.java  |  6 +--
 .../document/TestLatLonPolygonShapeQueries.java    |  2 +-
 .../lucene/document/TestXYPolygonShapeQueries.java |  2 +-
 .../lucene/index/TestFieldUpdatesBuffer.java       | 29 ++++++-------
 .../org/apache/lucene/index/TestIndexWriter.java   |  9 +++-
 .../lucene/search/TestConstantScoreScorer.java     |  2 +-
 .../org/apache/lucene/search/TestSearchAfter.java  |  4 +-
 .../apache/lucene/search/TestTopDocsCollector.java | 11 +++--
 .../lucene/search/TestTopFieldCollector.java       |  8 ++--
 .../lucene/store/TestFileSwitchDirectory.java      |  1 +
 .../apache/lucene/store/BaseDirectoryTestCase.java |  4 ++
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |  3 ++
 24 files changed, 141 insertions(+), 52 deletions(-)