[solr] branch main updated: LUCENE-10107 Read multi-line commit from Manifest (#2575)

[mdrob]

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

mdrob pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 2291d90  LUCENE-10107 Read multi-line commit from Manifest (#2575)
2291d90 is described below

commit 2291d90f9c678cbfd5e8fc6bc72206e8215ac745
Author: Mike Drob <md...@apache.org>
AuthorDate: Mon Sep 20 12:32:15 2021 -0500

    LUCENE-10107 Read multi-line commit from Manifest (#2575)
---
 dev-tools/scripts/buildAndPushRelease.py |  6 +++++-
 dev-tools/scripts/smokeTestRelease.py    | 12 ++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dev-tools/scripts/buildAndPushRelease.py 
b/dev-tools/scripts/buildAndPushRelease.py
index 21861cb..62010f0 100755
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -344,7 +344,11 @@ def main():
     print('Next run the smoker tester:')
     p = re.compile(".*/")
     m = p.match(sys.argv[0])
-    print('%s -u %ssmokeTestRelease.py %s' % (sys.executable, m.group(), url))
+    if not c.sign:
+        signed = "--not-signed"
+    else:
+        signed = ""
+    print('%s -u %ssmokeTestRelease.py %s %s' % (sys.executable, m.group(), 
signed, url))
 
 if __name__ == '__main__':
   try:
diff --git a/dev-tools/scripts/smokeTestRelease.py 
b/dev-tools/scripts/smokeTestRelease.py
index eca6e65..3db19ea 100755
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -169,11 +169,15 @@ def checkJARMetaData(desc, jarFile, gitRevision, version):
 
     if gitRevision != 'skip':
       # Make sure this matches the version and git revision we think we are 
releasing:
-      # TODO: LUCENE-7023: is it OK that Implementation-Version's value now 
spans two lines?
-      verifyRevision = 'Implementation-Version: %s %s' % (version, gitRevision)
-      if s.find(verifyRevision) == -1:
-        raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF 
(wrong git revision?)' % \
+      match = re.search("Implementation-Version: (.+\r\n .+)", s, re.MULTILINE)
+      if match:
+        implLine = match.group(1).replace("\r\n ", "")
+        verifyRevision = '%s %s' % (version, gitRevision)
+        if implLine.find(verifyRevision) == -1:
+          raise RuntimeError('%s is missing "%s" inside its 
META-INF/MANIFEST.MF (wrong git revision?)' % \
                            (desc, verifyRevision))
+      else:
+        raise RuntimeError('%s is missing Implementation-Version inside its 
META-INF/MANIFEST.MF' % desc)
 
     notice = decodeUTF8(z.read(NOTICE_FILE_NAME))
     license = decodeUTF8(z.read(LICENSE_FILE_NAME))