[lucene-solr] branch branch_8x updated: Add bugfix version 8.5.1

[iv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ivera pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new aa6f418  Add bugfix version 8.5.1
aa6f418 is described below

commit aa6f41803aabf9a2c09f0cfbe7cd955531ed8bbe
Author: iverase <iv...@apache.org>
AuthorDate: Thu Apr 16 09:27:06 2020 +0200

    Add bugfix version 8.5.1
---
 lucene/CHANGES.txt                                 |  6 ++++++
 .../src/java/org/apache/lucene/util/Version.java   | 25 ++++++++++++++--------
 solr/CHANGES.txt                                   |  8 +++++++
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 2611ad4..7e14124 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -85,6 +85,12 @@ Other
 * LUCENE-9271: ByteBufferIndexInput was refactored to work on top of the
   ByteBuffer API. (Adrien Grand)
 
+======================= Lucene 8.5.1 =======================
+
+Bug Fixes
+---------------------
+(No changes)
+
 ======================= Lucene 8.5.0 =======================
 
 API Changes
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 3e19a4f..c6204fd 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -24,7 +24,7 @@ import java.util.Locale;
 /**
  * Use by certain classes to match version compatibility
  * across releases of Lucene.
- * 
+ *
  * <p><b>WARNING</b>: When changing the version parameter
  * that you supply to components in Lucene, do not simply
  * change the version at search-time, but instead also adjust
@@ -195,6 +195,13 @@ public final class Version {
   public static final Version LUCENE_8_5_0 = new Version(8, 5, 0);
 
   /**
+   * Match settings and bugs in Lucene's 8.5.1 release.
+   * @deprecated Use latest
+   */
+  @Deprecated
+  public static final Version LUCENE_8_5_1 = new Version(8, 5, 1);
+
+  /**
    * Match settings and bugs in Lucene's 8.6.0 release.
    * <p>
    * Use this to get the latest &amp; greatest settings, bug
@@ -213,12 +220,12 @@ public final class Version {
    * then you should instead explicitly specify an actual
    * version.
    * <p>
-   * If you use this constant then you  may need to 
+   * If you use this constant then you  may need to
    * <b>re-index all of your documents</b> when upgrading
-   * Lucene, as the way text is indexed may have changed. 
+   * Lucene, as the way text is indexed may have changed.
    * Additionally, you may need to <b>re-test your entire
-   * application</b> to ensure it behaves as expected, as 
-   * some defaults may have changed and may break functionality 
+   * application</b> to ensure it behaves as expected, as
+   * some defaults may have changed and may break functionality
    * in your application.
    */
   public static final Version LATEST = LUCENE_8_6_0;
@@ -328,9 +335,9 @@ public final class Version {
         return LATEST;
       default:
         version = version
-          .replaceFirst("^LUCENE_(\\d+)_(\\d+)_(\\d+)$", "$1.$2.$3")
-          .replaceFirst("^LUCENE_(\\d+)_(\\d+)$", "$1.$2.0")
-          .replaceFirst("^LUCENE_(\\d)(\\d)$", "$1.$2.0");
+                .replaceFirst("^LUCENE_(\\d+)_(\\d+)_(\\d+)$", "$1.$2.$3")
+                .replaceFirst("^LUCENE_(\\d+)_(\\d+)$", "$1.$2.0")
+                .replaceFirst("^LUCENE_(\\d)(\\d)$", "$1.$2.0");
         try {
           return parse(version);
         } catch (ParseException pe) {
@@ -340,7 +347,7 @@ public final class Version {
         }
     }
   }
-  
+
   /** Returns a new version based on raw numbers
    *
    *  @lucene.internal */
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index be8594d..acfa64b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -98,6 +98,14 @@ Other Changes
   removed from solr-core in favor of SolrNamedThreadFactory in solrj package and all solr-core classes now use
   SolrNamedThreadFactory. (Andras Salamon, shalin)
 
+==================  8.5.1 ==================
+
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
+
+Bug Fixes
+---------------------
+(No changes)
+
 ==================  8.5.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.