[groovy2] 08/12: Remove reference to JavadocFixTool
komal sukhani
komal-guest at moszumanska.debian.org
Wed Jun 24 16:39:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
komal-guest pushed a commit to branch master
in repository groovy2.
commit d312450bf90ff455bb7824895d6c25af70fd4b22
Author: komal <komaldsukhani at gmail.com>
Date: Wed Jun 24 00:53:29 2015 +0530
Remove reference to JavadocFixTool
---
debian/patches/01_fix_doc_gradle.diff | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/debian/patches/01_fix_doc_gradle.diff b/debian/patches/01_fix_doc_gradle.diff
index 1604ea5..733a278 100644
--- a/debian/patches/01_fix_doc_gradle.diff
+++ b/debian/patches/01_fix_doc_gradle.diff
@@ -4,10 +4,10 @@ Forwarded: no
Last-Update: 2015-06-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: debian-groovy2/gradle/docs.gradle
+Index: alioth-groovy2/gradle/docs.gradle
===================================================================
---- debian-groovy2.orig/gradle/docs.gradle
-+++ debian-groovy2/gradle/docs.gradle
+--- alioth-groovy2.orig/gradle/docs.gradle
++++ alioth-groovy2/gradle/docs.gradle
@@ -1,22 +1,8 @@
task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK']) {
- if (JavaVersion.current().java7Compatible) {
@@ -98,6 +98,21 @@ Index: debian-groovy2/gradle/docs.gradle
}
// this will apply the javadoc fix tool to all generated javadocs
+@@ -170,10 +100,10 @@ allprojects {
+ tasks.withType(Javadoc).all {
+ doLast {
+ logger.lifecycle("Applying Javadoc fix tool (see http://www.kb.cert.org/vuls/id/225657) into $destinationDir".toString())
+- def javadocFix = new JavadocFixTool()
+- javadocFix.recursive = true
+- javadocFix.doPatch = true
+- javadocFix.searchAndPatch(destinationDir)
++ // def javadocFix = new JavadocFixTool()
++ // javadocFix.recursive = true
++ // javadocFix.doPatch = true
++ // javadocFix.searchAndPatch(destinationDir)
+ }
+ }
+ }
@@ -189,4 +119,4 @@ if (JavaVersion.current().isJava8Compati
options.addStringOption('Xdoclint:none', '-quiet')
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy2.git
More information about the pkg-java-commits
mailing list