From b8f251d8e9275cd766ce96b488526ebe92990c94 Mon Sep 17 00:00:00 2001 From: Mike McCandless Date: Thu, 18 Feb 2016 16:45:57 -0500 Subject: [PATCH] do not create a 5.6.0 version now since 5.5.0 is the last 5.x feature release --- lucene/CHANGES.txt | 3 --- lucene/core/src/java/org/apache/lucene/util/Version.java | 7 ------- solr/CHANGES.txt | 5 ----- 3 files changed, 15 deletions(-) diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index eea3a1ba2f2..9df01505d81 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -131,9 +131,6 @@ Other * LUCENE-7035: Upgrade icu4j to 56.1/unicode 8. (Robert Muir) -======================= Lucene 5.6.0 ======================= -(No Changes) - ======================= Lucene 5.5.0 ======================= New Features diff --git a/lucene/core/src/java/org/apache/lucene/util/Version.java b/lucene/core/src/java/org/apache/lucene/util/Version.java index b5a92149c3d..2b4cc57bf01 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Version.java +++ b/lucene/core/src/java/org/apache/lucene/util/Version.java @@ -102,13 +102,6 @@ public final class Version { @Deprecated public static final Version LUCENE_5_5_0 = new Version(5, 5, 0); - /** - * Match settings and bugs in Lucene's 5.6.0 release. - * @deprecated Use latest - */ - @Deprecated - public static final Version LUCENE_5_6_0 = new Version(5, 6, 0); - /** Match settings and bugs in Lucene's 6.0 release. *

* Use this to get the latest & greatest settings, bug diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 21a0264b718..e6635f169c2 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -263,11 +263,6 @@ Other Changes * SOLR-7339: Upgrade Jetty to v9.3.6.v20151106. (Gregg Donovan, shalin, Mark Miller) -======================= 5.6.0 ======================= - -New Features ----------------------- - * SOLR-5730: Make Lucene's SortingMergePolicy and EarlyTerminatingSortingCollector configurable in Solr. (Christine Poerschke, hossmann, Tomás Fernández Löbbe, Shai Erera)