diff -Nru groovy-2.4.15/debian/changelog groovy-2.4.15/debian/changelog --- groovy-2.4.15/debian/changelog 2018-04-08 19:16:43.000000000 -0300 +++ groovy-2.4.15/debian/changelog 2018-04-20 20:33:44.000000000 -0300 @@ -1,3 +1,14 @@ +groovy (2.4.15-1ubuntu1) UNRELEASED; urgency=medium + + * Replace HTTP URLs with local files: LP: #1765885. + - debian/control: build depends on -doc packages so javadoc can + properly link the apis. + - debian/patches/10_use_local_docs.patch, debian/control: include + javadoc apis locally as invalid, unreacheable, or nonexistent + links cause the build to faild with openjdk-10. + + -- Tiago Stürmer Daitx Fri, 20 Apr 2018 23:33:44 +0000 + groovy (2.4.15-1) 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-04-08 19:01:19.000000000 -0300 +++ groovy-2.4.15/debian/control 2018-04-20 20:33:44.000000000 -0300 @@ -1,7 +1,8 @@ Source: groovy Section: java Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Felix Natter Build-Depends: ant, @@ -9,10 +10,12 @@ antlr, bnd (>= 2.1.0), debhelper (>= 11), + default-jdk-doc, default-jdk-headless | default-jdk, gradle-debian-helper, ivy, junit4, + junit4-doc, libasm-java (>= 6.0~alpha-2~), libbsf-java, libcommons-cli-java, @@ -23,6 +26,7 @@ libjline2-java, libqdox-java, libservlet3.1-java, + libservlet3.1-java-doc, libxstream-java, locales-all | language-pack-en, maven-repo-helper, @@ -74,7 +78,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_use_local_docs.patch groovy-2.4.15/debian/patches/10_use_local_docs.patch --- groovy-2.4.15/debian/patches/10_use_local_docs.patch 1969-12-31 21:00:00.000000000 -0300 +++ groovy-2.4.15/debian/patches/10_use_local_docs.patch 2018-04-20 20:33:30.000000000 -0300 @@ -0,0 +1,38 @@ +--- a/gradle/docs.gradle ++++ b/gradle/docs.gradle +@@ -33,9 +33,11 @@ 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('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-jdk-doc/api/', 'file:///usr/share/doc/libservlet3.1-java-doc/api', ++ 'file:///usr/share/doc/junit4/api/') + } + } + +@@ -53,12 +55,14 @@ def groovydocSpec = { + overviewText = resources.text.fromFile(rootProject.file('src/main/overview.html')) + } + includePrivate = false +- link 'http://docs.oracle.com/javaee/7/api/', 'javax.servlet.', 'javax.management.' +- link 'http://docs.oracle.com/javase/8/docs/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.' +- link 'http://docs.groovy-lang.org/docs/ant/api/', 'org.apache.ant.', 'org.apache.tools.ant.' +- 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/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.' ++ //link 'http://docs.groovy-lang.org/docs/ant/api/', 'org.apache.ant.' ++ //link 'http://junit.org/junit4/javadoc/latest/', 'junit.' ++ //link 'http://www.antlr2.org/javadoc/', 'antlr.' ++ //link 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'org.apache.commons.cli.' + } + + allprojects { diff -Nru groovy-2.4.15/debian/patches/series groovy-2.4.15/debian/patches/series --- groovy-2.4.15/debian/patches/series 2018-04-08 18:55:15.000000000 -0300 +++ groovy-2.4.15/debian/patches/series 2018-04-20 20:33:44.000000000 -0300 @@ -8,3 +8,4 @@ transition_Gradle_3.1.patch 08_GROOVY-8163.patch 09_ignore_buildscan.patch +10_use_local_docs.patch