Closes TAP5-2343: check JDK version only if the aggregateJavadoc is executed, perform version check only on JDK 1.5 through 1.7
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b4fd5686 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b4fd5686 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b4fd5686 Branch: refs/heads/master Commit: b4fd5686936a6587e12835cc2040db367b5a8e95 Parents: f3c872f Author: Jochen Kemnade <jkemn...@apache.org> Authored: Thu May 29 12:10:52 2014 +0200 Committer: Jochen Kemnade <jkemn...@apache.org> Committed: Thu May 29 12:10:52 2014 +0200 ---------------------------------------------------------------------- build.gradle | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b4fd5686/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 74b24bd..b349e74 100755 --- a/build.gradle +++ b/build.gradle @@ -298,11 +298,11 @@ subprojects { // Cribbed from https://github.com/hibernate/hibernate-core/blob/master/release/release.gradle#L19 task aggregateJavadoc(type: Javadoc) { - - // Temporary: don't check on the CI server. This can be removed when the CI server is upgraded. - if (!continuousIntegrationBuild && !checkJDK()) - throw new StopActionException("Update your JDK to fix VU#225657") - + doFirst { + // Temporary: don't check on the CI server. This can be removed when the CI server is upgraded. + if (!continuousIntegrationBuild && !checkJDK()) + throw new StopActionException("Update your JDK to fix VU#225657") + } dependsOn configurations.javadoc group "Documentation" @@ -557,14 +557,18 @@ boolean checkJDK() { def match = jdkVersion =~ /_(\d+)/ if (!match.find()) - throw new IllegalStateException("""Could not parse minor version number out of "#{jdkVersion}".""") + throw new IllegalStateException("""Could not parse minor version number out of "${jdkVersion}".""") def minor = match[0][1].toInteger() if (jdkVersion.startsWith("1.7")) { minor > 21 } - else { // JDK 6 and 5 require the same minor version + else if (jdkVersion.startsWith("1.5") || jdkVersion.startsWith("1.6")) { + // JDK 6 and 5 require the same minor version minor > 45 } + else { + true + } }