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 2017/01/16 21:08:24 UTC
[23/23] lucene-solr:jira/solr-8593: Merge branch
'apache-https-master' into jira/solr-8593
Merge branch 'apache-https-master' into jira/solr-8593
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/292e5188
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/292e5188
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/292e5188
Branch: refs/heads/jira/solr-8593
Commit: 292e518878c29cb81d300cf48dcf657ef5438397
Parents: 483bfa6 205f9cc
Author: Kevin Risden <kr...@apache.org>
Authored: Mon Jan 16 16:07:54 2017 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Mon Jan 16 16:07:54 2017 -0500
----------------------------------------------------------------------
.../dot.settings/org.eclipse.jdt.core.prefs | 8 +-
lucene/CHANGES.txt | 36 ++-
.../miscellaneous/FixBrokenOffsetsFilter.java | 78 +++++++
.../FixBrokenOffsetsFilterFactory.java | 39 ++++
.../analysis/ngram/EdgeNGramTokenFilter.java | 16 +-
.../lucene/analysis/ngram/NGramTokenFilter.java | 18 +-
...ache.lucene.analysis.util.TokenFilterFactory | 1 +
.../TestFixBrokenOffsetsFilter.java | 50 +++++
.../lucene/analysis/ngram/TestNGramFilters.java | 47 ++++
.../apache/lucene/index/FixBrokenOffsets.java | 125 +++++++++++
.../java/org/apache/lucene/index/package.html | 27 +++
.../lucene/index/TestFixBrokenOffsets.java | 115 ++++++++++
.../lucene/index/index.630.brokenoffsets.zip | Bin 0 -> 3203 bytes
.../org/apache/lucene/index/CheckIndex.java | 29 ++-
.../lucene/index/DefaultIndexingChain.java | 20 +-
.../apache/lucene/index/SortedDocValues.java | 22 ++
.../apache/lucene/index/SortedSetDocValues.java | 22 ++
.../lucene/search/DoubleValuesSource.java | 92 ++++++--
.../lucene/search/MultiCollectorManager.java | 6 +-
.../java/org/apache/lucene/util/Version.java | 7 +
.../org/apache/lucene/index/TestCheckIndex.java | 5 -
.../search/highlight/TokenSourcesTest.java | 2 +-
lucene/ivy-versions.properties | 5 +-
.../queries/function/FunctionMatchQuery.java | 99 +++++++++
.../queries/function/FunctionScoreQuery.java | 151 +++++++++++++
.../function/TestFunctionMatchQuery.java | 61 ++++++
.../function/TestFunctionScoreExplanations.java | 105 +++++++++
.../function/TestFunctionScoreQuery.java | 114 ++++++++++
.../lucene/queryparser/xml/CoreParser.java | 2 -
.../lucene/search/TestTermAutomatonQuery.java | 3 +
.../index/BaseDocValuesFormatTestCase.java | 32 +++
.../index/BaseTermVectorsFormatTestCase.java | 17 +-
.../apache/lucene/index/BaseTestCheckIndex.java | 19 --
.../java/org/apache/lucene/util/TestUtil.java | 4 +-
solr/CHANGES.txt | 34 ++-
.../handler/dataimport/TestJdbcDataSource.java | 7 +
solr/contrib/morphlines-core/ivy.xml | 8 +-
solr/core/ivy.xml | 4 +-
.../solr/handler/admin/MetricsHandler.java | 92 +++++---
.../solr/highlight/LuceneRegexFragmenter.java | 217 +++++++++++++++++++
.../apache/solr/highlight/RegexFragmenter.java | 196 -----------------
.../apache/solr/metrics/SolrMetricManager.java | 30 ++-
.../apache/solr/schema/PreAnalyzedField.java | 11 +
.../org/apache/solr/cloud/ClusterStateTest.java | 8 +
...verseerCollectionConfigSetProcessorTest.java | 4 +-
.../solr/core/BlobRepositoryMockingTest.java | 9 +-
.../org/apache/solr/core/CoreSorterTest.java | 7 +
.../solr/handler/admin/MetricsHandlerTest.java | 26 ++-
.../solr/index/hdfs/CheckHdfsIndexTest.java | 5 -
.../ApacheLuceneSolrNearQueryBuilder.java | 1 -
.../apache/solr/search/GoodbyeQueryBuilder.java | 1 -
.../apache/solr/search/HandyQueryBuilder.java | 1 -
.../apache/solr/search/HelloQueryBuilder.java | 1 -
.../security/TestPKIAuthenticationPlugin.java | 8 +
.../solr/servlet/SolrRequestParserTest.java | 3 +
solr/licenses/byte-buddy-1.6.2.jar.sha1 | 1 +
solr/licenses/byte-buddy-LICENSE-ASL.txt | 202 +++++++++++++++++
solr/licenses/byte-buddy-NOTICE.txt | 4 +
solr/licenses/mockito-core-1.9.5.jar.sha1 | 1 -
solr/licenses/mockito-core-2.6.2.jar.sha1 | 1 +
solr/licenses/objenesis-1.2.jar.sha1 | 1 -
solr/licenses/objenesis-2.5.jar.sha1 | 1 +
.../solrj/impl/CloudSolrClientCacheTest.java | 7 +
.../solr/cloud/AbstractDistribZkTestBase.java | 5 +-
64 files changed, 1875 insertions(+), 398 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/292e5188/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --cc lucene/ivy-versions.properties
index 2b53454,6cb7f26..66c4b41
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@@ -94,7 -96,7 +94,8 @@@ io.netty.netty-all.version = 4.0.36.Fin
/mecab/mecab-ipadic = 2.7.0-20070801
/mecab/mecab-naist-jdic = 0.6.3b-20111013
/net.arnx/jsonic = 1.2.7
+ /net.bytebuddy/byte-buddy = 1.6.2
+/net.hydromatic/eigenbase-properties = 1.1.5
/net.sf.ehcache/ehcache-core = 2.4.4
/net.sf.saxon/Saxon-HE = 9.6.0-2
/net.sourceforge.argparse4j/argparse4j = 0.4.3
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/292e5188/solr/core/ivy.xml
----------------------------------------------------------------------
diff --cc solr/core/ivy.xml
index ecebd97,074e35f..dc58ad5
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@@ -51,15 -51,17 +51,17 @@@
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${/org.slf4j/slf4j-log4j12}" conf="compile"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="compile"/>
+ <!-- TODO: Nuke those 2 deps, please!!!! -->
<dependency org="org.easymock" name="easymock" rev="${/org.easymock/easymock}" conf="test"/>
<dependency org="cglib" name="cglib-nodep" rev="${/cglib/cglib-nodep}" conf="test"/>
- <dependency org="org.objenesis" name="objenesis" rev="${/org.objenesis/objenesis}" conf="test"/>
<dependency org="org.mockito" name="mockito-core" rev="${/org.mockito/mockito-core}" conf="test"/>
+ <dependency org="net.bytebuddy" name="byte-buddy" rev="${/net.bytebuddy/byte-buddy}" conf="test"/>
+ <dependency org="org.objenesis" name="objenesis" rev="${/org.objenesis/objenesis}" conf="test"/>
<dependency org="com.fasterxml.jackson.core" name="jackson-core" rev="${/com.fasterxml.jackson.core/jackson-core}" conf="compile"/>
- <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="${/com.fasterxml.jackson.core/jackson-databind}" conf="test"/>
- <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="${/com.fasterxml.jackson.core/jackson-annotations}" conf="test"/>
+ <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="${/com.fasterxml.jackson.core/jackson-databind}" conf="compile"/>
+ <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="${/com.fasterxml.jackson.core/jackson-annotations}" conf="compile"/>
<dependency org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" rev="${/com.fasterxml.jackson.dataformat/jackson-dataformat-smile}" conf="compile"/>