You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2017/07/03 19:13:35 UTC

[11/11] lucene-solr:master: Merge branch 'upgrade-master-to-8' of https://github.com/anshumg/lucene-solr for 7.0 release ( closes #119 )

Merge branch 'upgrade-master-to-8' of https://github.com/anshumg/lucene-solr for 7.0 release ( closes #119 )


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

Branch: refs/heads/master
Commit: 8218a5b2c6ca78c05a6060af4770c504e28a6f99
Parents: 68a46ac bc9c414
Author: Anshum Gupta <an...@apple.com>
Authored: Mon Jul 3 12:11:52 2017 -0700
Committer: Anshum Gupta <an...@apple.com>
Committed: Mon Jul 3 12:11:52 2017 -0700

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |    3 +
 .../analysis/custom/TestCustomAnalyzer.java     |    8 +-
 .../lucene50/Lucene50SegmentInfoFormat.java     |   90 -
 .../apache/lucene/codecs/lucene50/package.html  |   25 -
 .../codecs/lucene53/Lucene53NormsFormat.java    |   91 -
 .../codecs/lucene53/Lucene53NormsProducer.java  |  236 ---
 .../lucene/codecs/lucene53/package-info.java    |   23 -
 .../lucene54/Lucene54DocValuesConsumer.java     |  797 --------
 .../lucene54/Lucene54DocValuesFormat.java       |  186 --
 .../lucene54/Lucene54DocValuesProducer.java     | 1803 ------------------
 .../lucene/codecs/lucene54/package-info.java    |  403 ----
 .../lucene/codecs/lucene60/Lucene60Codec.java   |  177 --
 .../apache/lucene/codecs/lucene60/package.html  |   25 -
 .../lucene/codecs/lucene62/Lucene62Codec.java   |  176 --
 .../apache/lucene/codecs/lucene62/package.html  |   25 -
 .../apache/lucene/index/FixBrokenOffsets.java   |  138 --
 .../java/org/apache/lucene/index/package.html   |   27 -
 .../services/org.apache.lucene.codecs.Codec     |    2 -
 .../org.apache.lucene.codecs.DocValuesFormat    |    1 -
 .../lucene50/Lucene50RWSegmentInfoFormat.java   |  125 --
 .../lucene50/TestLucene50SegmentInfoFormat.java |   50 -
 .../codecs/lucene53/Lucene53NormsConsumer.java  |  159 --
 .../codecs/lucene53/Lucene53RWNormsFormat.java  |   31 -
 .../lucene53/TestLucene53NormsFormat.java       |   44 -
 .../lucene54/TestLucene54DocValuesFormat.java   |  640 -------
 .../lucene/codecs/lucene60/Lucene60RWCodec.java |   38 -
 .../lucene/codecs/lucene62/Lucene62RWCodec.java |   44 -
 .../lucene62/Lucene62RWSegmentInfoFormat.java   |  193 --
 .../lucene62/TestLucene62SegmentInfoFormat.java |   48 -
 .../index/TestBackwardsCompatibility.java       |   64 +-
 .../lucene/index/TestFixBrokenOffsets.java      |  112 --
 .../lucene/index/TestIndexWriterOnOldIndex.java |    7 +-
 .../lucene/index/TestManyPointsInOldIndex.java  |    1 +
 .../org/apache/lucene/index/dvupdates.6.0.0.zip |  Bin 3420 -> 0 bytes
 .../org/apache/lucene/index/empty.6.0.0.zip     |  Bin 225 -> 0 bytes
 .../org/apache/lucene/index/index.6.0.0-cfs.zip |  Bin 15807 -> 0 bytes
 .../apache/lucene/index/index.6.0.0-nocfs.zip   |  Bin 15806 -> 0 bytes
 .../org/apache/lucene/index/index.6.0.1-cfs.zip |  Bin 15820 -> 0 bytes
 .../apache/lucene/index/index.6.0.1-nocfs.zip   |  Bin 15823 -> 0 bytes
 .../org/apache/lucene/index/index.6.1.0-cfs.zip |  Bin 15803 -> 0 bytes
 .../apache/lucene/index/index.6.1.0-nocfs.zip   |  Bin 15829 -> 0 bytes
 .../org/apache/lucene/index/index.6.2.0-cfs.zip |  Bin 15880 -> 0 bytes
 .../apache/lucene/index/index.6.2.0-nocfs.zip   |  Bin 15867 -> 0 bytes
 .../org/apache/lucene/index/index.6.2.1-cfs.zip |  Bin 15851 -> 0 bytes
 .../apache/lucene/index/index.6.2.1-nocfs.zip   |  Bin 15845 -> 0 bytes
 .../org/apache/lucene/index/index.6.3.0-cfs.zip |  Bin 15869 -> 0 bytes
 .../apache/lucene/index/index.6.3.0-nocfs.zip   |  Bin 15876 -> 0 bytes
 .../org/apache/lucene/index/index.6.4.0-cfs.zip |  Bin 15829 -> 0 bytes
 .../apache/lucene/index/index.6.4.0-nocfs.zip   |  Bin 15831 -> 0 bytes
 .../org/apache/lucene/index/index.6.4.1-cfs.zip |  Bin 15848 -> 0 bytes
 .../apache/lucene/index/index.6.4.1-nocfs.zip   |  Bin 15838 -> 0 bytes
 .../org/apache/lucene/index/index.6.4.2-cfs.zip |  Bin 15856 -> 0 bytes
 .../apache/lucene/index/index.6.4.2-nocfs.zip   |  Bin 15886 -> 0 bytes
 .../org/apache/lucene/index/index.6.5.0-cfs.zip |  Bin 15832 -> 0 bytes
 .../apache/lucene/index/index.6.5.0-nocfs.zip   |  Bin 15836 -> 0 bytes
 .../org/apache/lucene/index/index.6.5.1-cfs.zip |  Bin 15842 -> 0 bytes
 .../apache/lucene/index/index.6.5.1-nocfs.zip   |  Bin 15827 -> 0 bytes
 .../org/apache/lucene/index/index.6.6.0-cfs.zip |  Bin 15875 -> 0 bytes
 .../apache/lucene/index/index.6.6.0-nocfs.zip   |  Bin 15883 -> 0 bytes
 .../lucene/index/index.630.brokenoffsets.zip    |  Bin 3203 -> 0 bytes
 .../lucene/index/index.single-empty-doc.630.zip |  Bin 1363 -> 0 bytes
 .../org/apache/lucene/index/manypointsindex.zip |  Bin 3739 -> 0 bytes
 .../org/apache/lucene/index/maxposindex.zip     |  Bin 1702 -> 0 bytes
 .../org/apache/lucene/index/moreterms.6.0.0.zip |  Bin 157215 -> 0 bytes
 .../org/apache/lucene/index/sorted.6.2.0.zip    |  Bin 157007 -> 0 bytes
 .../org/apache/lucene/index/sorted.6.2.1.zip    |  Bin 100974 -> 0 bytes
 .../org/apache/lucene/index/sorted.6.3.0.zip    |  Bin 71090 -> 0 bytes
 .../lucene/index/unsupported.6.0.0-cfs.zip      |  Bin 0 -> 15807 bytes
 .../lucene/index/unsupported.6.0.0-nocfs.zip    |  Bin 0 -> 15806 bytes
 .../lucene/index/unsupported.6.0.1-cfs.zip      |  Bin 0 -> 15820 bytes
 .../lucene/index/unsupported.6.0.1-nocfs.zip    |  Bin 0 -> 15823 bytes
 .../lucene/index/unsupported.6.1.0-cfs.zip      |  Bin 0 -> 15803 bytes
 .../lucene/index/unsupported.6.1.0-nocfs.zip    |  Bin 0 -> 15829 bytes
 .../lucene/index/unsupported.6.2.0-cfs.zip      |  Bin 0 -> 15880 bytes
 .../lucene/index/unsupported.6.2.0-nocfs.zip    |  Bin 0 -> 15867 bytes
 .../lucene/index/unsupported.6.2.1-cfs.zip      |  Bin 0 -> 15851 bytes
 .../lucene/index/unsupported.6.2.1-nocfs.zip    |  Bin 0 -> 15845 bytes
 .../lucene/index/unsupported.6.3.0-cfs.zip      |  Bin 0 -> 15869 bytes
 .../lucene/index/unsupported.6.3.0-nocfs.zip    |  Bin 0 -> 15876 bytes
 .../lucene/index/unsupported.6.4.0-cfs.zip      |  Bin 0 -> 15829 bytes
 .../lucene/index/unsupported.6.4.0-nocfs.zip    |  Bin 0 -> 15831 bytes
 .../lucene/index/unsupported.6.4.1-cfs.zip      |  Bin 0 -> 15848 bytes
 .../lucene/index/unsupported.6.4.1-nocfs.zip    |  Bin 0 -> 15838 bytes
 .../lucene/index/unsupported.6.4.2-cfs.zip      |  Bin 0 -> 15856 bytes
 .../lucene/index/unsupported.6.4.2-nocfs.zip    |  Bin 0 -> 15886 bytes
 .../lucene/index/unsupported.6.5.0-cfs.zip      |  Bin 0 -> 15832 bytes
 .../lucene/index/unsupported.6.5.0-nocfs.zip    |  Bin 0 -> 15836 bytes
 .../lucene/index/unsupported.6.5.1-cfs.zip      |  Bin 0 -> 15842 bytes
 .../lucene/index/unsupported.6.5.1-nocfs.zip    |  Bin 0 -> 15827 bytes
 .../lucene/index/unsupported.6.6.0-cfs.zip      |  Bin 0 -> 15875 bytes
 .../lucene/index/unsupported.6.6.0-nocfs.zip    |  Bin 0 -> 15883 bytes
 .../org/apache/lucene/index/CheckIndex.java     |   47 +-
 .../index/IndexFormatTooOldException.java       |    2 +-
 .../org/apache/lucene/index/IndexWriter.java    |    6 +-
 .../org/apache/lucene/index/SegmentInfos.java   |    2 +-
 .../search/similarities/BM25Similarity.java     |   38 +-
 .../search/similarities/SimilarityBase.java     |   25 +-
 .../search/similarities/TFIDFSimilarity.java    |   25 +-
 .../java/org/apache/lucene/util/Version.java    |  101 +-
 .../apache/lucene/index/TestSegmentInfos.java   |   14 +-
 .../search/similarities/TestBM25Similarity.java |   42 -
 .../similarities/TestClassicSimilarity.java     |   59 +-
 .../search/similarities/TestSimilarityBase.java |   39 -
 .../org/apache/lucene/util/TestVersion.java     |   71 +-
 .../java/org/apache/lucene/util/TestUtil.java   |    4 +-
 lucene/version.properties                       |    2 +-
 solr/CHANGES.txt                                |   17 +
 .../solr/schema/FieldTypePluginLoader.java      |    6 +-
 .../org/apache/solr/schema/IndexSchema.java     |    4 +-
 .../apache/solr/schema/IndexSchemaFactory.java  |    9 +-
 .../similarities/SchemaSimilarityFactory.java   |    4 +-
 .../configsets/_default/conf/solrconfig.xml     |    2 +-
 .../TestNonDefinedSimilarityFactory.java        |   10 -
 .../example-DIH/solr/atom/conf/solrconfig.xml   |    2 +-
 .../example-DIH/solr/db/conf/solrconfig.xml     |    2 +-
 .../example-DIH/solr/mail/conf/solrconfig.xml   |    2 +-
 .../example-DIH/solr/solr/conf/solrconfig.xml   |    2 +-
 .../example-DIH/solr/tika/conf/solrconfig.xml   |    2 +-
 solr/example/files/conf/solrconfig.xml          |    2 +-
 .../configsets/_default/conf/solrconfig.xml     |    2 +-
 .../conf/solrconfig.xml                         |    2 +-
 121 files changed, 179 insertions(+), 6158 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8218a5b2/lucene/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8218a5b2/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index fac639b,c65671a..5e1481f
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -16,17 -16,25 +16,34 @@@ In this release, there is an example So
  servlet container in the directory named "example".
  See the Quick Start guide at http://lucene.apache.org/solr/quickstart.html
  
+ ==================  8.0.0 ==================
+ 
+ Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
+ 
+ Versions of Major Components
+ ---------------------
+ Apache Tika 1.13
+ Carrot2 3.15.0
+ Velocity 1.7 and Velocity Tools 2.0
+ Apache UIMA 2.3.1
+ Apache ZooKeeper 3.4.10
+ Jetty 9.3.14.v20161028
+ 
+ 
+ (No Changes)
+ 
+ 
  ==================  7.0.0 ==================
  
 +Versions of Major Components
 +---------------------
 +Apache Tika 1.13
 +Carrot2 3.15.0
 +Velocity 1.7 and Velocity Tools 2.0
 +Apache UIMA 2.3.1
 +Apache ZooKeeper 3.4.10
 +Jetty 9.3.14.v20161028
 +
  Upgrading from Solr 6.x
  ----------------------