From 00718a2704349a1afb9a8cee4ab902c21097eac4 Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Wed, 12 Mar 2014 13:35:55 +0000
Subject: [PATCH] LUCENE-5514: Update changes.txt

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1576736 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/CHANGES.txt | 20 ++++++++++----------
 solr/CHANGES.txt   | 13 +++++++++++++
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 508ca7bc97f..ad5201841c2 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -8,9 +8,6 @@ http://s.apache.org/luceneversions
 
 New Features
 
-* LUCENE-4747: Move to Java 7 as minimum Java version.
-  (Robert Muir, Uwe Schindler)
-
 * SOLR-3359: Added analyzer attribute/property to SynonymFilterFactory.
   (Ryo Onodera via Koji Sekiguchi)
 
@@ -58,16 +55,14 @@ Documentation
 * LUCENE-5392: Add/improve analysis package documentation to reflect
   analysis API changes.  (Benson Margulies via Robert Muir - pull request #17)
 
-Optimizations
-
-* LUCENE-4848: Use Java 7 NIO2-FileChannel instead of RandomAccessFile
-  for NIOFSDirectory and MMapDirectory. This allows to delete open files
-  on Windows if NIOFSDirectory is used, mmapped files are still locked.
-  (Michael Poindexter, Robert Muir, Uwe Schindler)
-
 
 ======================= Lucene 4.8.0 =======================
 
+System Requirements
+
+* LUCENE-4747, LUCENE-5514: Move to Java 7 as minimum Java version.
+  (Robert Muir, Uwe Schindler)
+
 Changes in Runtime Behavior
 
 * LUCENE-5472: IndexWriter.addDocument will now throw an IllegalArgumentException 
@@ -132,6 +127,11 @@ Optimizations
   all known openoffice dictionaries without error, and supports an additional 
   longestOnly option for a less aggressive approach.  (Robert Muir)
 
+* LUCENE-4848: Use Java 7 NIO2-FileChannel instead of RandomAccessFile
+  for NIOFSDirectory and MMapDirectory. This allows to delete open files
+  on Windows if NIOFSDirectory is used, mmapped files are still locked.
+  (Michael Poindexter, Robert Muir, Uwe Schindler)
+
 Bug fixes
 
 * LUCENE-5450: Fix getField() NPE issues with SpanOr/SpanNear when they have an 
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a812d2eee75..29f315e8fa4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -85,10 +85,23 @@ Upgrading from Solr 4.7
   that is too large.  If you wish to continue to have large terms ignored,
   use "solr.LengthFilterFactory" in all of your Analyzers.  See LUCENE-5472 for
   more details.
+  
+* Solr 4.8 needs Java 7 as minimum requirement.  If you not have done already,
+  update the underlying JDK/JRE versions to at least Oracle Java 7u1 or OpenJDK
+  7u1.  Please review the list of known JVM bugs at:
+  http://wiki.apache.org/lucene-java/JavaBugs
+  Solr 4.8 was also tested to work with Java 8, so give it a try!
 
 Detailed Change List
 ----------------------
 
+System Requirements
+----------------------
+
+* LUCENE-4747, LUCENE-5514: Move to Java 7 as minimum Java version.
+  (Robert Muir, Uwe Schindler)
+
+
 New Features
 ----------------------