Disable java and maven version checking

And fix typo in email html
This commit is contained in:
David Pilato 2014-03-19 22:29:26 +01:00
parent fb2a232431
commit 64e993b754
1 changed files with 6 additions and 21 deletions

View File

@ -43,7 +43,7 @@ from os.path import dirname, abspath
The script takes over almost all The script takes over almost all
steps necessary for a release from a high level point of view it does the following things: steps necessary for a release from a high level point of view it does the following things:
- run prerequisite checks ie. check for Java 1.6 being present or S3 credentials available as env variables - run prerequisite checks ie. check for S3 credentials available as env variables
- detect the version to release from the specified branch (--branch) or the current branch - detect the version to release from the specified branch (--branch) or the current branch
- creates a release branch & updates pom.xml and README.md to point to a release version rather than a snapshot - creates a release branch & updates pom.xml and README.md to point to a release version rather than a snapshot
- builds the artifacts - builds the artifacts
@ -109,18 +109,6 @@ def java_exe():
path = JAVA_HOME path = JAVA_HOME
return 'export JAVA_HOME="%s" PATH="%s/bin:$PATH" JAVACMD="%s/bin/java"' % (path, path, path) return 'export JAVA_HOME="%s" PATH="%s/bin:$PATH" JAVACMD="%s/bin/java"' % (path, path, path)
def verify_java_version(version):
s = os.popen('%s; java -version 2>&1' % java_exe()).read()
if s.find(' version "%s.' % version) == -1:
raise RuntimeError('got wrong version for java %s:\n%s' % (version, s))
# Verifies the java version. We guarantee that we run with Java 1.6
# If 1.6 is not available fail the build!
def verify_mvn_java_version(version, mvn):
s = os.popen('%s; %s --version 2>&1' % (java_exe(), mvn)).read()
if s.find('Java version: %s' % version) == -1:
raise RuntimeError('got wrong java version for %s %s:\n%s' % (mvn, version, s))
# Returns the hash of the current git HEAD revision # Returns the hash of the current git HEAD revision
def get_head_hash(): def get_head_hash():
return os.popen(' git rev-parse --verify HEAD 2>&1').read().strip() return os.popen(' git rev-parse --verify HEAD 2>&1').read().strip()
@ -133,9 +121,6 @@ def get_tag_hash(tag):
def get_current_branch(): def get_current_branch():
return os.popen('git rev-parse --abbrev-ref HEAD 2>&1').read().strip() return os.popen('git rev-parse --abbrev-ref HEAD 2>&1').read().strip()
verify_java_version('1.6') # we require to build with 1.6
verify_mvn_java_version('1.6', MVN)
# Utility that returns the name of the release branch for a given version # Utility that returns the name of the release branch for a given version
def release_branch(version): def release_branch(version):
return 'release_branch_%s' % version return 'release_branch_%s' % version
@ -356,7 +341,7 @@ def format_issues_html(issues, title='Fix'):
if len(issues) > 0: if len(issues) > 0:
response += '<h2>%s</h2>\n<ul>\n' % title response += '<h2>%s</h2>\n<ul>\n' % title
for issue in issues: for issue in issues:
response += '</li>[<a href="%s">%s</a>] - %s\n' % (issue.html_url, issue.number, issue.title) response += '<li>[<a href="%s">%s</a>] - %s\n' % (issue.html_url, issue.number, issue.title)
response += '</ul>\n' response += '</ul>\n'
return response return response