[lucene] branch branch_9x updated: Backport #854 to branch_9x

[to...@apache.org]

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

tomoko pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new bf69a477346 Backport #854 to branch_9x
bf69a477346 is described below

commit bf69a477346c474a7aae0d5d375dd7d4684e6f13
Author: Tomoko Uchida <to...@gmail.com>
AuthorDate: Mon May 2 23:06:39 2022 +0900

    Backport #854 to branch_9x
---
 gradle/documentation/changes-to-html/changes2html.pl | 4 ++--
 lucene/CHANGES.txt                                   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gradle/documentation/changes-to-html/changes2html.pl b/gradle/documentation/changes-to-html/changes2html.pl
index 0d55437721c..67a76ff5e94 100644
--- a/gradle/documentation/changes-to-html/changes2html.pl
+++ b/gradle/documentation/changes-to-html/changes2html.pl
@@ -25,7 +25,7 @@ use strict;
 use warnings;
 
 my $jira_url_prefix = 'http://issues.apache.org/jira/browse/';
-my $github_pull_request_prefix = 'https://github.com/apache/lucene-solr/pull/';
+my $github_pull_request_prefix = 'https://github.com/apache/lucene/pull/';
 my $month_regex = &setup_month_regex;
 my %month_nums = &setup_month_nums;
 my %lucene_bugzilla_jira_map = &setup_lucene_bugzilla_jira_map;
@@ -572,7 +572,7 @@ for my $rel (@releases) {
       $item =~ s{((LUCENE|SOLR|INFRA)\s+(\d{3,}))}
                 {<a href="${jira_url_prefix}\U$2\E-$3">$1</a>}gi;
       # Link "[ github | gh ] pull request [ # ] X+" to Github pull request
-      $item =~ s{((?:(?:(?:github|gh)\s+)?pull\s+request\s*(?:\#?\s*)?|gh-)(\d+))}
+      $item =~ s{((?:(?:(?:github|gh)\s+)?pull\s+request\s*(?:\#?\s*)?|gh-|github#)(\d+))}
                 {<a href="${github_pull_request_prefix}$2">$1</a>}gi;
       # Link "LUCENE_CHANGES.txt" to Lucene's same-release Changes.html
       if ($product eq 'SOLR') {
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 2061457484d..e4244f10153 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -120,6 +120,8 @@ Other
 * LUCENE-10541: Test-framework: limit the default length of MockTokenizer tokens to 255.
   (Robert Muir, Uwe Schindler, Tomoko Uchida, Dawid Weiss)
 
+* GITHUB#854: Allow to link to GitHub pull request from CHANGES. (Tomoko Uchida, Jan Høydahl)
+
 ======================= Lucene 9.1.0 =======================
 
 API Changes