Please consider the attached patch.
It includes one additional "fix" from the Ubuntu delta to get
groovydoc to ignore a file which was causing groovydoc to output a NUL
char to stdout, that in turn caused the archive builders to fail -
something about the python script giving up due to the output. I
believe the debian builders are not affected, but in case you see any
value on it, please use it. And if you really don't care about this
patch let me know and I will send another debdiff without it.
Note: for the Ubuntu side we have discussed cleaning up the output
from sbuild, it's on my todo list, I consider the exclude list to be a
temporary fix.
diff -Nru groovy-2.4.15/debian/changelog groovy-2.4.15/debian/changelog
--- groovy-2.4.15/debian/changelog 2018-09-05 05:00:55.000000000 +0100
+++ groovy-2.4.15/debian/changelog 2018-09-27 18:46:07.000000000 +0100
@@ -1,3 +1,18 @@
+groovy (2.4.15-4) cosmic; urgency=medium
+
+ * Replace HTTP URLs with local files: (Closes: #910098)
+ - debian/control: build depends on -doc packages so javadoc can
+ properly link the apis.
+ - debian/patches/10_fix_javadoc_links.patch: include javadoc apis
+ locally, since openjdk 10 any invalid, unreacheable, or
+ nonexistent doc link causes the build to fail.
+ * debian/patches/11_exclude_groovydoc.patch: exclude file
+ org/codehaus/groovy/runtime/EncodingGroovyMethodsSupport.java from
+ groovydoc because groovydoc complains about a NUL char and throws
+ it to the build log, this causes the archive builders to fail.
+
+ -- Tiago Stürmer Daitx <tiago.da...@ubuntu.com> Mon, 24 Sep 2018 12:19:05 +0000
+
groovy (2.4.15-3) unstable; urgency=medium
* Team upload.
diff -Nru groovy-2.4.15/debian/control groovy-2.4.15/debian/control
--- groovy-2.4.15/debian/control 2018-09-05 05:00:55.000000000 +0100
+++ groovy-2.4.15/debian/control 2018-09-24 13:33:43.000000000 +0100
@@ -1,6 +1,7 @@
Uploaders: Felix Natter <fnat...@gmx.net>
Build-Depends:
ant,
+ ant-doc,
ant-optional,
antlr,
bnd (>= 2.1.0),
@@ -14,6 +16,7 @@
gradle-debian-helper,
ivy,
junit4,
+ junit4-doc,
libasm-java (>= 6.0~alpha-2~),
libbsf-java,
libcommons-cli-java,
@@ -24,6 +27,7 @@
libjline2-java,
libqdox-java,
libservlet3.1-java,
+ libservlet3.1-java-doc,
libxstream-java,
locales-all | language-pack-en,
maven-repo-helper,
@@ -75,7 +79,7 @@
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Recommends: default-jdk-doc
+Recommends: default-jdk-doc, juni4-doc, libservlet3.1-java-doc
Suggests: groovy
Description: Agile dynamic language for the Java Virtual Machine (documentation)
Groovy is an agile dynamic language for the JVM combining lots of great
diff -Nru groovy-2.4.15/debian/patches/10_fix_javadoc_links.patch groovy-2.4.15/debian/patches/10_fix_javadoc_links.patch
--- groovy-2.4.15/debian/patches/10_fix_javadoc_links.patch 2018-09-05 05:00:55.000000000 +0100
+++ groovy-2.4.15/debian/patches/10_fix_javadoc_links.patch 2018-09-24 13:32:01.000000000 +0100
@@ -3,18 +3,20 @@
Forwarded: not-needed
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
-@@ -33,9 +33,7 @@
+@@ -33,9 +33,9 @@ def javadocSpec = {
overview = rootProject.file('src/main/overviewj.html')
footer = doc.footer
source = rootProject.useIndy()?'1.7':'1.6'
- links('http://docs.oracle.com/javase/8/docs/api/', 'http://docs.oracle.com/javaee/7/api/',
- 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'http://junit.org/junit4/javadoc/latest/',
- 'http://docs.oracle.com/javaee/6/api/', 'http://www.antlr2.org/javadoc/')
-+ links('file:/usr/share/doc/default-jre/api/')
++ links('file:///usr/share/doc/ant/api/', 'file:///usr/share/doc/default-jdk-doc/api/',
++ 'file:///usr/share/doc/libservlet3.1-java-doc/api',
++ 'file:///usr/share/doc/junit4/api/')
}
}
-@@ -53,12 +51,7 @@
+@@ -53,12 +53,10 @@ def groovydocSpec = {
overviewText = resources.text.fromFile(rootProject.file('src/main/overview.html'))
}
includePrivate = false
@@ -24,7 +26,10 @@
- link 'http://junit.org/junit4/javadoc/latest/', 'org.junit.', 'junit.'
- link 'http://www.antlr2.org/javadoc/', 'antlr.'
- link 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'org.apache.commons.cli.'
-+ link 'file:/usr/share/doc/default-jre/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.'
++ link 'file:///usr/share/doc/libservlet3.1-java-doc/api', 'javax.servlet.', 'javax.management.'
++ link 'file:///usr/share/doc/default-jdk-doc/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.'
++ link 'file:///usr/share/doc/ant/api/', 'org.apache.tools.ant.'
++ link 'file:///usr/share/doc/junit4/api/', 'org.junit.'
}
allprojects {
diff -Nru groovy-2.4.15/debian/patches/11_exclude_groovydoc.patch groovy-2.4.15/debian/patches/11_exclude_groovydoc.patch
--- groovy-2.4.15/debian/patches/11_exclude_groovydoc.patch 1970-01-01 01:00:00.000000000 +0100
+++ groovy-2.4.15/debian/patches/11_exclude_groovydoc.patch 2018-09-27 18:44:25.000000000 +0100
@@ -0,0 +1,18 @@
+Description: exclude file from groovydoc
+ Exclude file org/codehaus/groovy/runtime/EncodingGroovyMethodsSupport.java
+ from groovydoc because groovydoc complains about a NUL char and throws
+ it to the build log, this causes the archive builders to fail.
+Author: Tiago Stürmer Daitx <tda...@gmail.com>
+Last-Update: 2018-09-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/gradle/docs.gradle
++++ b/gradle/docs.gradle
+@@ -52,6 +52,7 @@ def groovydocSpec = {
+ } else {
+ overviewText = resources.text.fromFile(rootProject.file('src/main/overview.html'))
+ }
++ exclude 'org/codehaus/groovy/runtime/EncodingGroovyMethodsSupport.java'
+ includePrivate = false
+ link 'file:///usr/share/doc/libservlet3.1-java-doc/api', 'javax.servlet.', 'javax.management.'
+ link 'file:///usr/share/doc/default-jre/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.'
diff -Nru groovy-2.4.15/debian/patches/series groovy-2.4.15/debian/patches/series
--- groovy-2.4.15/debian/patches/series 2018-09-05 05:00:55.000000000 +0100
+++ groovy-2.4.15/debian/patches/series 2018-09-27 17:08:32.000000000 +0100
@@ -9,3 +9,4 @@
08_GROOVY-8163.patch
09_ignore_buildscan.patch
10_fix_javadoc_links.patch
+11_exclude_groovydoc.patch
