From 356fa5d13736bd8e5fb81c0080b671cd9a7d4890 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Mon, 21 Nov 2011 11:27:57 +0000
Subject: [PATCH] preparing Lucene 3.5 release adding 3.6 constants and changes
 sections

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1204451 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/CHANGES.txt                                  | 5 +++++
 lucene/contrib/CHANGES.txt                          | 4 ++++
 lucene/src/java/org/apache/lucene/util/Version.java | 7 +++++++
 solr/CHANGES.txt                                    | 4 ++++
 solr/contrib/clustering/CHANGES.txt                 | 4 ++++
 solr/contrib/extraction/CHANGES.txt                 | 4 ++++
 solr/contrib/langid/CHANGES.txt                     | 4 ++++
 solr/contrib/uima/CHANGES.txt                       | 4 ++++
 8 files changed, 36 insertions(+)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index fcbc8711bf7..2675d62e343 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -636,6 +636,11 @@ Bug fixes
   when the directory isn't MMapDirectory, due to failing to reuse
   DocsAndPositionsEnum while merging (Marc Sturlese, Erick Erickson,
   Robert Muir, Simon Willnauer, Mike McCandless)
+  
+  
+======================= Lucene 3.6.0 =======================
+
+(No Changes)
 
 ======================= Lucene 3.5.0 =======================
 
diff --git a/lucene/contrib/CHANGES.txt b/lucene/contrib/CHANGES.txt
index 69340d89d1f..00222d1bb61 100644
--- a/lucene/contrib/CHANGES.txt
+++ b/lucene/contrib/CHANGES.txt
@@ -81,6 +81,10 @@ Bug Fixes
  * LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
    not lowercasing the key before checking for the tag (Adriano Crestani)
 
+======================= Lucene 3.6.0 ================
+
+(No Changes)
+
 ======================= Lucene 3.5.0 ================
 
 Changes in backwards compatibility policy
diff --git a/lucene/src/java/org/apache/lucene/util/Version.java b/lucene/src/java/org/apache/lucene/util/Version.java
index 93e3dd1a9f8..a159411ba92 100644
--- a/lucene/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/src/java/org/apache/lucene/util/Version.java
@@ -72,6 +72,13 @@ public enum Version {
    */
   @Deprecated
   LUCENE_35,
+  
+  /**
+   * Match settings and bugs in Lucene's 3.6 release.
+   * @deprecated (4.0) Use latest
+   */
+  @Deprecated
+  LUCENE_36,
 
   /** Match settings and bugs in Lucene's 4.0 release. 
    *  <p>
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d743df900f5..45afeccb591 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -369,6 +369,10 @@ Documentation
 
 * SOLR-2232: Improved README info on solr.solr.home in examples
   (Eric Pugh and hossman)
+  
+==================  3.6.0  ==================
+
+(No Changes)
 
 ==================  3.5.0  ==================
 
diff --git a/solr/contrib/clustering/CHANGES.txt b/solr/contrib/clustering/CHANGES.txt
index f1749a82245..3fd25222143 100644
--- a/solr/contrib/clustering/CHANGES.txt
+++ b/solr/contrib/clustering/CHANGES.txt
@@ -11,6 +11,10 @@ $Id$
 
 (No Changes)
 
+================== Release 3.6.0 ==================
+
+(No Changes)
+
 ================== Release 3.5.0 ==================
 
 (No Changes)
diff --git a/solr/contrib/extraction/CHANGES.txt b/solr/contrib/extraction/CHANGES.txt
index fa3a7060725..ab2adf66cf4 100644
--- a/solr/contrib/extraction/CHANGES.txt
+++ b/solr/contrib/extraction/CHANGES.txt
@@ -28,6 +28,10 @@ $Id$
 
 (No Changes)
 
+================== Release 3.6.0 ==================
+
+(No Changes)
+
 ================== Release 3.5.0 ==================
 
 * SOLR-2372: Upgrade Solr to Tika 0.10 (janhoy)
diff --git a/solr/contrib/langid/CHANGES.txt b/solr/contrib/langid/CHANGES.txt
index 08699fb9ef1..10873e15f09 100644
--- a/solr/contrib/langid/CHANGES.txt
+++ b/solr/contrib/langid/CHANGES.txt
@@ -7,6 +7,10 @@ See http://wiki.apache.org/solr/LanguageDetection for details
 
 $Id$
 
+================== Release 3.6.0 ==================
+
+(No Changes)
+
 ================== Release 3.5.0 ==================
 
 Initial release.  See README.txt.
diff --git a/solr/contrib/uima/CHANGES.txt b/solr/contrib/uima/CHANGES.txt
index 4460d506e30..3a790706dc3 100644
--- a/solr/contrib/uima/CHANGES.txt
+++ b/solr/contrib/uima/CHANGES.txt
@@ -23,6 +23,10 @@ $Id$
 
 (No Changes)
 
+==================  3.6.0 ==================
+
+(No Changes)
+
 ==================  3.5.0 ==================
 
 Other Changes