You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/08/21 08:50:12 UTC
lucene-solr:master: also accept ant 1.9.x in JAR manifest
Repository: lucene-solr
Updated Branches:
refs/heads/master e32597311 -> 2a337c399
also accept ant 1.9.x in JAR manifest
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2a337c39
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2a337c39
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2a337c39
Branch: refs/heads/master
Commit: 2a337c399469bc9c21dec98e31465ed80a6931d8
Parents: e325973
Author: Mike McCandless <mi...@apache.org>
Authored: Sun Aug 21 04:48:59 2016 -0400
Committer: Mike McCandless <mi...@apache.org>
Committed: Sun Aug 21 04:50:02 2016 -0400
----------------------------------------------------------------------
dev-tools/scripts/smokeTestRelease.py | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2a337c39/dev-tools/scripts/smokeTestRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index 7a28ad7..9d4a2c7 100644
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -190,16 +190,23 @@ def checkJARMetaData(desc, jarFile, gitRevision, version):
'Implementation-Vendor: The Apache Software Foundation',
# Make sure 1.8 compiler was used to build release bits:
'X-Compile-Source-JDK: 8',
- # Make sure 1.8 ant was used to build release bits: (this will match 1.8+)
- 'Ant-Version: Apache Ant 1.8',
+ # Make sure 1.8 or 1.9 ant was used to build release bits: (this will match 1.8.x, 1.9.x)
+ ('Ant-Version: Apache Ant 1.8', 'Ant-Version: Apache Ant 1.9'),
# Make sure .class files are 1.8 format:
'X-Compile-Target-JDK: 8',
'Specification-Version: %s' % version,
# Make sure the release was compiled with 1.8:
'Created-By: 1.8'):
- if s.find(verify) == -1:
- raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF' % \
- (desc, verify))
+ if type(verify) is not tuple:
+ verify = (verify,)
+ for x in verify:
+ if s.find(x) != -1:
+ break
+ else:
+ if len(verify) == 1:
+ raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF' % (desc, verify[0]))
+ else:
+ raise RuntimeError('%s is missing one of "%s" inside its META-INF/MANIFEST.MF' % (desc, verify))
if gitRevision != 'skip':
# Make sure this matches the version and git revision we think we are releasing: