From ceaeb42a1f31eff6e7f96c5d55a1c21449fbf07f Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Mon, 16 Jan 2017 11:50:28 +0100
Subject: [PATCH] Add 6.5 version also in trunk; sync up CHANGES.txt

---
 lucene/CHANGES.txt                              | 17 +++++++----------
 .../java/org/apache/lucene/util/Version.java    |  7 +++++++
 solr/CHANGES.txt                                | 17 +++++++++++++++++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 530b0d40da9..496345406f4 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -121,8 +121,7 @@ New features
 
 * LUCENE-5325: Added LongValuesSource and DoubleValuesSource, intended as
   type-safe replacements for ValueSource in the queries module.  These
-  expose per-segment LongValues or DoubleValues iterators, similar to the
-  existing DocValues iterator API. (Alan Woodward, Adrien Grand)
+  expose per-segment LongValues or DoubleValues iterators. (Alan Woodward, Adrien Grand)
 
 * LUCENE-7603: Graph token streams are now handled accurately by query
   parsers, by enumerating all paths and creating the corresponding
@@ -180,6 +179,9 @@ Bug Fixes
 
 Improvements
 
+* LUCENE-7532: Add back lost codec file format documentation
+  (Shinichiro Abe via Mike McCandless)
+
 * LUCENE-6824: TermAutomatonQuery now rewrites to TermQuery,
   PhraseQuery or MultiPhraseQuery when the word automaton is simple
   (Mike McCandless)
@@ -206,14 +208,14 @@ Improvements
   which can be overridden to return false to eek out more speed in some cases.
   (Timothy M. Rodriguez, David Smiley)
 
-* LUCENE-7537: Index time sorting now supports multi-valued sorts
-  using selectors (MIN, MAX, etc.) (Jim Ferenczi via Mike McCandless)
-
 * LUCENE-7560: QueryBuilder.createFieldQuery is no longer final,
   giving custom query parsers subclassing QueryBuilder more freedom to
   control how text is analyzed and converted into a query (Matt Weber
   via Mike McCandless)
 
+* LUCENE-7537: Index time sorting now supports multi-valued sorts
+  using selectors (MIN, MAX, etc.) (Jim Ferenczi via Mike McCandless)
+
 * LUCENE-7575: UnifiedHighlighter can now highlight fields with queries that don't
   necessarily refer to that field (AKA requireFieldMatch==false). Disabled by default.
   See UH get/setFieldMatcher. (Jim Ferenczi via David Smiley)
@@ -254,11 +256,6 @@ Optimizations
 
 * LUCENE-7572: Doc values queries now cache their hash code. (Adrien Grand)
 
-* LUCENE-7579: Segments are now also sorted during flush, and merging
-  on a sorted index is substantially faster by using some of the same
-  bulk merge optimizations that non-sorted merging uses (Jim Ferenczi
-  via Mike McCandless)
-
 Other
 
 * LUCENE-7546: Fixed references to benchmark wikipedia data and the Jenkins line-docs file
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 2355a9aa892..00fb3298746 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -80,6 +80,13 @@ public final class Version {
   @Deprecated
   public static final Version LUCENE_6_4_0 = new Version(6, 4, 0);
 
+  /**
+   * Match settings and bugs in Lucene's 6.5.0 release.
+   * @deprecated Use latest
+   */
+  @Deprecated
+  public static final Version LUCENE_6_5_0 = new Version(6, 5, 0);
+
   /**
    * Match settings and bugs in Lucene's 7.0.0 release.
    *  <p>
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f8ecf231380..487406789ca 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -77,6 +77,23 @@ Optimizations
 * SOLR-9941: Clear the deletes lists at UpdateLog before replaying from log. This prevents redundantly pre-applying
   DBQs, during the log replay, to every update in the log as if the DBQs were out of order. (hossman, Ishan Chattopadhyaya)
 
+==================  6.5.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.6
+Jetty 9.3.14.v20161028
+
+
+(No Changes)
+
+
 ==================  6.4.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.