You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2015/04/06 21:20:17 UTC
[2/9] tapestry-5 git commit: Update JavaDoc template selection to
work under JDK 1.8 (and later)
Update JavaDoc template selection to work under JDK 1.8 (and later)
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/99600b97
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/99600b97
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/99600b97
Branch: refs/heads/master
Commit: 99600b97fa6a35fd506b3bff83f1f6b748617822
Parents: df55ff6
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Apr 6 09:48:28 2015 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Apr 6 09:48:28 2015 -0700
----------------------------------------------------------------------
build.gradle | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/99600b97/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 696465d..e1cc52a 100755
--- a/build.gradle
+++ b/build.gradle
@@ -319,7 +319,7 @@ task aggregateJavadoc(type: Javadoc) {
maxMemory "512m"
destinationDir file("$buildDir/documentation/javadocs")
- def tapestryStylesheet = isJDK7() ? file("src/javadoc/stylesheet7.css") : file("src/javadoc/stylesheet.css");
+ def tapestryStylesheet = isJDKAfter6() ? file("src/javadoc/stylesheet7.css") : file("src/javadoc/stylesheet.css");
configure(options) {
splitIndex true
@@ -579,8 +579,8 @@ boolean isWindows() {
System.properties['os.name'].toLowerCase().contains('windows')
}
-boolean isJDK7() {
- System.properties['java.version'].startsWith("1.7.")
+boolean isJDKAfter6() {
+ ! System.properties['java.version'].matches('1\\.[5|6]\\..*')
}
// Check JDK version to prevent VU#225657 see: