[solr] branch main updated: Revert "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 223080d  Revert "LUCENE-10107 Read multi-line commit from Manifest 
(#2575)"
223080d is described below

commit 223080d592b7685385b17d46553cf2d02bca3543
Author: Mike Drob <md...@apache.org>
AuthorDate: Mon Sep 20 13:45:20 2021 -0500

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

diff --git a/dev-tools/scripts/buildAndPushRelease.py 
b/dev-tools/scripts/buildAndPushRelease.py
index 62010f0..21861cb 100755
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -344,11 +344,7 @@ def main():
     print('Next run the smoker tester:')
     p = re.compile(".*/")
     m = p.match(sys.argv[0])
-    if not c.sign:
-        signed = "--not-signed"
-    else:
-        signed = ""
-    print('%s -u %ssmokeTestRelease.py %s %s' % (sys.executable, m.group(), 
signed, url))
+    print('%s -u %ssmokeTestRelease.py %s' % (sys.executable, m.group(), url))
 
 if __name__ == '__main__':
   try:
diff --git a/dev-tools/scripts/smokeTestRelease.py 
b/dev-tools/scripts/smokeTestRelease.py
index 3db19ea..eca6e65 100755
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -169,15 +169,11 @@ def checkJARMetaData(desc, jarFile, gitRevision, version):
 
     if gitRevision != 'skip':
       # Make sure this matches the version and git revision we think we are 
releasing:
-      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?)' % \
+      # 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?)' % \
                            (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))