[6/6] git commit: Temporarily disable the JDK check for the CI server

[hl...@apache.org]

Temporarily disable the JDK check for the CI server


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e2db6e23
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e2db6e23
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e2db6e23

Branch: refs/heads/master
Commit: e2db6e238f49d531873799703cc2d9e9ca772b96
Parents: 9caac8e
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sun Jul 21 16:49:18 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sun Jul 21 16:49:18 2013 -0700

----------------------------------------------------------------------
 build.gradle | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e2db6e23/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 4ecaa77..13dd9e3 100755
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,8 @@ project.ext.versions = [
     selenium: "2.33.0"
 ]
 
+ext.continuousIntegrationBuild = Boolean.getBoolean("ci")
+
 // Provided so that the CI server can override the normal version number for nightly builds.
 project.version = tapestryVersion()
 
@@ -38,7 +40,7 @@ def tapestryVersion() {
 
     // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build.
     // When building normally, or for a release, no suffix is desired.
-    Boolean.getBoolean("ci") ? major + "-SNAPSHOT" : major + minor
+    continuousIntegrationBuild ? major + "-SNAPSHOT" : major + minor
 }
 
 // Let analysis.apache.org get in touch with our builds
@@ -262,7 +264,8 @@ subprojects.each { project.evaluationDependsOn(it.name) }
 
 task aggregateJavadoc(type: Javadoc) {
 
-    if ( !checkJDK() )
+    // 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