From 178d83d635b6663d82bd94c111ee1ee4cdd66d52 Mon Sep 17 00:00:00 2001
From: Jason Gerlowski <jason.gerlowski@lucidworks.com>
Date: Fri, 9 Oct 2020 10:25:19 -0400
Subject: [PATCH 1/2] Update addVersion.py test running to gradle

---
 dev-tools/scripts/addVersion.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.py
index 0fc0c5adb11..72c9a0d7079 100755
--- a/dev-tools/scripts/addVersion.py
+++ b/dev-tools/scripts/addVersion.py
@@ -162,18 +162,12 @@ def update_solrconfig(filename, matcher, new_version):
 
 def check_lucene_version_tests():
   print('  checking lucene version tests...', end='', flush=True)
-  base_dir = os.getcwd()
-  os.chdir('lucene/core') 
-  run('ant test -Dtestcase=TestVersion')
-  os.chdir(base_dir)
+  run('./gradlew -p lucene/core test --tests TestVersion')
   print('ok')
 
 def check_solr_version_tests():
   print('  checking solr version tests...', end='', flush=True)
-  base_dir = os.getcwd()
-  os.chdir('solr/core') 
-  run('ant test -Dtestcase=TestLuceneMatchVersion')
-  os.chdir(base_dir)
+  run('./gradlew -p solr/core test --tests TestLuceneMatchVersion')
   print('ok')
 
 def read_config(current_version):

From 76a8cc3c3e0cd83eb39200e780a3737dc94d66b4 Mon Sep 17 00:00:00 2001
From: Jason Gerlowski <jason.gerlowski@lucidworks.com>
Date: Fri, 9 Oct 2020 10:27:42 -0400
Subject: [PATCH 2/2] Add bugfix version 8.6.3

---
 lucene/CHANGES.txt                                       | 6 ++++++
 lucene/core/src/java/org/apache/lucene/util/Version.java | 7 +++++++
 solr/CHANGES.txt                                         | 8 ++++++++
 3 files changed, 21 insertions(+)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index e2be6ee5eb3..28067e70f03 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -310,6 +310,12 @@ Build
 
 * Upgrade forbiddenapis to version 3.1.  (Uwe Schindler)
 
+======================= Lucene 8.6.3 =======================
+
+Bug Fixes
+---------------------
+(No changes)
+
 ======================= Lucene 8.6.2 =======================
 
 Bug Fixes
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 6f7605b9622..1f7081d7d0c 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -130,6 +130,13 @@ public final class Version {
   @Deprecated
   public static final Version LUCENE_8_6_2 = new Version(8, 6, 2);
 
+  /**
+   * Match settings and bugs in Lucene's 8.6.3 release.
+   * @deprecated Use latest
+   */
+  @Deprecated
+  public static final Version LUCENE_8_6_3 = new Version(8, 6, 3);
+
   /**
    * Match settings and bugs in Lucene's 9.0.0 release.
    * <p>
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f0bc220ed7c..33d7b9c58a1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -307,6 +307,14 @@ Other Changes
 
 * SOLR-14659: Remove restlet as dependency for the ManagedResource API (Timothy Potter, noble)
 
+==================  8.6.3 ==================
+
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
+
+Bug Fixes
+---------------------
+(No changes)
+
 ==================  8.6.2 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.