From d3e43ba112e5b2e415f7f24e0fe18855c2132e08 Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Tue, 22 Apr 2014 10:24:39 +0000
Subject: [PATCH] Fix upgrading instructions in CHANGES.txt to include recent
 Java 7 instructions

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1589071 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a5e5c16d7fe..f8d3c1f5335 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -145,11 +145,12 @@ Upgrading from Solr 4.7
   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:
+* Solr 4.8 requires Java 7 or greater, Java 8 is verified to be
+  compatible and may bring some performance improvements. When using
+  Oracle Java 7 or OpenJDK 7, be sure to not use the GA build 147 or
+  update versions u40, u45 and u51! We recommend using u55 or later.
+  An overview of known JVM bugs can be found on
   http://wiki.apache.org/lucene-java/JavaBugs
-  Solr 4.8 was also tested to work with Java 8, so give it a try!
 
 * ZooKeeper is upgraded from 3.4.5 to 3.4.6.