diff --git a/build.xml b/build.xml index 8b65cc1ff29..5b1a95023ca 100644 --- a/build.xml +++ b/build.xml @@ -281,7 +281,6 @@ JAVA7_HOME property or environment variable is not defined. - @@ -303,7 +302,7 @@ - + diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py index 162a908b19e..686300a85a5 100644 --- a/dev-tools/scripts/smokeTestRelease.py +++ b/dev-tools/scripts/smokeTestRelease.py @@ -198,8 +198,6 @@ def checkJARMetaData(desc, jarFile, svnRevision, version): 'Ant-Version: Apache Ant 1.8', # Make sure .class files are 1.7 format: 'X-Compile-Target-JDK: 1.7', - # Make sure this matches the version and svn revision we think we are releasing: - 'Implementation-Version: %s %s ' % (version, svnRevision), 'Specification-Version: %s' % version, # Make sure the release was compiled with 1.7: 'Created-By: 1.7'): @@ -207,6 +205,13 @@ def checkJARMetaData(desc, jarFile, svnRevision, version): raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF' % \ (desc, verify)) + if svnRevision != 'skip': + # Make sure this matches the version and svn revision we think we are releasing: + verifyRevision = 'Implementation-Version: %s %s ' % (version, svnRevision) + if s.find(verifyRevision) == -1: + raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF (wrong svn revision?)' % \ + (desc, verifyRevision)) + notice = decodeUTF8(z.read(NOTICE_FILE_NAME)) license = decodeUTF8(z.read(LICENSE_FILE_NAME))