From 05bb3e8673d60708a160c1ffa4eab173194df61c Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Fri, 11 Apr 2014 05:39:28 +0000
Subject: [PATCH] Move to Lucene 4.9 on stable branch

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1586576 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/CHANGES.txt                            |  6 ++++++
 .../java/org/apache/lucene/util/Version.java  |  7 +++++++
 solr/CHANGES.txt                              | 20 +++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index f59a40f9dcd..f431000ce46 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -71,6 +71,12 @@ Other
 * LUCENE-5563: Removed sep layout: which has fallen behind on features and doesn't
   perform as well as other options.  (Robert Muir)
 
+======================= Lucene 4.9.0 =======================
+
+New Features
+
+* placeolder
+
 ======================= Lucene 4.8.0 =======================
 
 System Requirements
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 bced35a99dd..cd8f4979710 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -96,6 +96,13 @@ public enum Version {
   @Deprecated
   LUCENE_48,
 
+  /**
+   * Match settings and bugs in Lucene's 4.9 release.
+   * @deprecated (5.0) Use latest
+   */
+  @Deprecated
+  LUCENE_49,
+
   /** Match settings and bugs in Lucene's 5.0 release.
    *  <p>
    *  Use this to get the latest &amp; greatest settings, bug
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 262995b0e7c..b5dc75c7aa8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -76,6 +76,26 @@ Other Changes
 * SOLR-5936: Removed deprecated non-Trie-based numeric & date field types.
   (Steve Rowe)
 
+==================  4.9.0 ==================
+
+Versions of Major Components
+---------------------
+Apache Tika 1.5
+Carrot2 3.9.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.6
+
+Upgrading from Solr 4.8
+----------------------
+
+* placeholder
+
+Detailed Change List
+----------------------
+
+* placeholder
+
 ==================  4.8.0 ==================
 
 Versions of Major Components