From 241fb6b2a789caa3dce80222124adfd887280933 Mon Sep 17 00:00:00 2001
From: Masatake Iwasaki <iwasakims@apache.org>
Date: Thu, 26 May 2022 12:23:30 +0900
Subject: [PATCH] HADOOP-18251. Fix failure of extracting JIRA id from commit
 message in git_jira_fix_version_check.py. (#4344)

(cherry picked from commit 6b331dde31cec2676a93406c9ecf699fc0675c8c)
---
 .../git-jira-validation/git_jira_fix_version_check.py      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-support/git-jira-validation/git_jira_fix_version_check.py b/dev-support/git-jira-validation/git_jira_fix_version_check.py
index c2e12a13aae..513cc8e25ff 100644
--- a/dev-support/git-jira-validation/git_jira_fix_version_check.py
+++ b/dev-support/git-jira-validation/git_jira_fix_version_check.py
@@ -71,10 +71,9 @@ for commit in subprocess.check_output(['git', 'log', '--pretty=oneline']).decode
         print("Commit seems reverted. \t\t\t Commit: " + commit)
         continue
     ACTUAL_PROJECT_JIRA = None
-    for project_jira in project_jira_keys:
-        if project_jira in commit:
-            ACTUAL_PROJECT_JIRA = project_jira
-            break
+    matches = re.findall('|'.join(project_jira_keys), commit)
+    if matches:
+        ACTUAL_PROJECT_JIRA = matches[0]
     if not ACTUAL_PROJECT_JIRA:
         print("WARN: Jira not found. \t\t\t Commit: " + commit)
         continue