Repository: incubator-groovy Updated Branches: refs/heads/master fc552801e -> 09dcdd61b
replace ant javadoc fixtool call with gradle plugin (closes #35) Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/09dcdd61 Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/09dcdd61 Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/09dcdd61 Branch: refs/heads/master Commit: 09dcdd61bea1830e2a6d554f67490870f1211473 Parents: fc55280 Author: Paul King <pa...@asert.com.au> Authored: Mon Jun 8 21:04:46 2015 +1000 Committer: Paul King <pa...@asert.com.au> Committed: Mon Jun 8 21:04:46 2015 +1000 ---------------------------------------------------------------------- build.gradle | 6 ++++++ gradle/docs.gradle | 19 ++----------------- 2 files changed, 8 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/09dcdd61/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 9a20301..ae5e3eb 100644 --- a/build.gradle +++ b/build.gradle @@ -23,12 +23,17 @@ buildscript { name 'Bintray Asciidoctor repo' url 'http://dl.bintray.com/content/aalmiray/asciidoctor' } + maven{ + name 'Bintray Javadoc Hotfix repo' + url 'http://dl.bintray.com/melix/gradle-javadoc-hotfix-plugin' + } } dependencies { // using the old "classpath" style of plugins because the new one doesn't play well with multi-modules classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.2' classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.0.3" + classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1' //classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1' //classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0' } @@ -37,6 +42,7 @@ buildscript { apply from: 'gradle/filter.gradle' apply from: 'gradle/indy.gradle' apply from: 'gradle/bintray.gradle' +apply plugin: 'javadocHotfix' File javaHome = new File(System.getProperty('java.home')) logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})" http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/09dcdd61/gradle/docs.gradle ---------------------------------------------------------------------- diff --git a/gradle/docs.gradle b/gradle/docs.gradle index d81399f..44cb5a7 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -183,24 +183,9 @@ task docGDK { } } -// this will apply the javadoc fix tool to all generated javadocs -// we use it to make sure that the javadocs are not vulnerable independently of the JDK used to build +// apply javadoc fix tool to generated javadocs - ensures no vulnerability even on old JDK versions allprojects { - tasks.withType(Javadoc).all { - doLast { - logger.lifecycle("Fixing Javadoc (see http://www.kb.cert.org/vuls/id/225657) for $destinationDir".toString()) - def fixtext = org.apache.tools.ant.taskdefs.Javadoc.getResourceAsStream('javadoc-frame-injections-fix.txt').text.trim() - ant { - replace(encoding: 'UTF-8', summary: true) { - fileset(dir: destinationDir, casesensitive: false, includes: '**/index.html,**/index.htm,**/toc.html,**/toc.htm') { - not { contains(text: 'function validURL(url) {', casesensitive: true) } - } - replaceToken('function loadFrames() {') - replaceValue(expandProperties: false, fixtext) - } - } - } - } + apply plugin: 'javadocHotfix' } if (JavaVersion.current().isJava7Compatible()) {
