diff -Nru maven-javadoc-plugin-3.0.1/debian/changelog maven-javadoc-plugin-3.0.1/debian/changelog --- maven-javadoc-plugin-3.0.1/debian/changelog 2018-07-30 08:59:33.000000000 +0000 +++ maven-javadoc-plugin-3.0.1/debian/changelog 2019-02-19 11:24:11.000000000 +0000 @@ -1,3 +1,31 @@ +maven-javadoc-plugin (3.0.1-3~18.04.1) bionic; urgency=medium + + * Backport from Disco. + * Fix FTBFS for multiple packages caused by OpenJDK 11 javadoc. (LP: #1814133) + + -- Tiago Stürmer Daitx Tue, 19 Feb 2019 11:24:11 +0000 + +maven-javadoc-plugin (3.0.1-3) unstable; urgency=medium + + * Team upload. + * Add default-detectJavaApiLink-to-false.patch (Closes: #919798) + This addresses FTBFS bugs for multiple javadoc packages that + build-depend on maven. Also see: + - https://github.com/oracle/opengrok/issues/2629 + - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919831 + Thank you to Markus Koschany for identifying a work-around. + + -- tony mancill Sun, 17 Feb 2019 10:36:03 -0800 + +maven-javadoc-plugin (3.0.1-2) unstable; urgency=medium + + * Team upload. + * Add patch for uncaught IOException FTBFS (Closes: #914411) + * Bump Standards-Version to 4.2.1 + * Update Homepage and Source URLs to use https + + -- tony mancill Sat, 24 Nov 2018 10:17:09 -0800 + maven-javadoc-plugin (3.0.1-1) unstable; urgency=medium * Team upload. diff -Nru maven-javadoc-plugin-3.0.1/debian/control maven-javadoc-plugin-3.0.1/debian/control --- maven-javadoc-plugin-3.0.1/debian/control 2018-07-30 07:56:58.000000000 +0000 +++ maven-javadoc-plugin-3.0.1/debian/control 2019-02-17 18:36:03.000000000 +0000 @@ -24,10 +24,10 @@ libplexus-languages-java, libqdox2-java, maven-debian-helper (>> 0.4) -Standards-Version: 4.1.5 +Standards-Version: 4.2.1 Vcs-Git: https://salsa.debian.org/java-team/maven-javadoc-plugin.git Vcs-Browser: https://salsa.debian.org/java-team/maven-javadoc-plugin -Homepage: http://maven.apache.org/plugins/maven-javadoc-plugin/ +Homepage: https://maven.apache.org/plugins/maven-javadoc-plugin/ Package: libmaven-javadoc-plugin-java Architecture: all diff -Nru maven-javadoc-plugin-3.0.1/debian/copyright maven-javadoc-plugin-3.0.1/debian/copyright --- maven-javadoc-plugin-3.0.1/debian/copyright 2018-07-30 08:52:35.000000000 +0000 +++ maven-javadoc-plugin-3.0.1/debian/copyright 2019-02-17 18:36:03.000000000 +0000 @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Maven Javadoc Plugin Upstream-Contact: Apache Maven team -Source: http://maven.apache.org +Source: https://maven.apache.org/plugins/maven-javadoc-plugin/ Files-Excluded: *.jar Files: * @@ -13,6 +13,7 @@ 2010, Torsten Werner 2011, Miguel Landaeta 2013-2018, Emmanuel Bourg + 2018, tony mancill License: GPL-3+ License: GPL-3+ diff -Nru maven-javadoc-plugin-3.0.1/debian/patches/default-detectJavaApiLink-to-false.patch maven-javadoc-plugin-3.0.1/debian/patches/default-detectJavaApiLink-to-false.patch --- maven-javadoc-plugin-3.0.1/debian/patches/default-detectJavaApiLink-to-false.patch 1970-01-01 00:00:00.000000000 +0000 +++ maven-javadoc-plugin-3.0.1/debian/patches/default-detectJavaApiLink-to-false.patch 2019-02-17 18:36:03.000000000 +0000 @@ -0,0 +1,26 @@ +Description: set detectJavaApiLink default value to false +Author: tony mancill +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919798 +Comment: Also see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919831 +Forwarded: not-needed + +--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java ++++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +@@ -587,7 +587,7 @@ + *
+ * See + * Javadoc +- * for the default values. ++ * for the default values. For Debian, the default value is false. See Debian bug 919798. + *
+ * + * @see #links +@@ -595,7 +595,7 @@ + * @see #DEFAULT_JAVA_API_LINKS + * @since 2.6 + */ +- @Parameter( property = "detectJavaApiLink", defaultValue = "true" ) ++ @Parameter( property = "detectJavaApiLink", defaultValue = "false" ) + private boolean detectJavaApiLink; + + /** diff -Nru maven-javadoc-plugin-3.0.1/debian/patches/plexus-utils.patch maven-javadoc-plugin-3.0.1/debian/patches/plexus-utils.patch --- maven-javadoc-plugin-3.0.1/debian/patches/plexus-utils.patch 1970-01-01 00:00:00.000000000 +0000 +++ maven-javadoc-plugin-3.0.1/debian/patches/plexus-utils.patch 2019-02-17 18:36:03.000000000 +0000 @@ -0,0 +1,35 @@ +--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java ++++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +@@ -1178,14 +1178,24 @@ + InvocationOutputHandler outputHandler = new PrintStreamHandler( ps, false ); + request.setOutputHandler( outputHandler ); + +- outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with " +- + ( properties == null ? "no properties" : "properties=" + properties ) ); +- outputHandler.consumeLine( "" ); +- outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) ); +- outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) ); +- outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) ); +- outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) ); +- outputHandler.consumeLine( "" ); ++ try ++ { ++ outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with " ++ + ( properties == null ? "no properties" : "properties=" + properties ) ); ++ outputHandler.consumeLine( "" ); ++ outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) ); ++ outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) ); ++ outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) ); ++ outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) ); ++ outputHandler.consumeLine( "" ); ++ } ++ catch ( IOException e ) ++ { ++ if ( log != null && log.isDebugEnabled() ) ++ { ++ log.debug( "IOException: " + e.getMessage() ); ++ } ++ } + + try + { diff -Nru maven-javadoc-plugin-3.0.1/debian/patches/series maven-javadoc-plugin-3.0.1/debian/patches/series --- maven-javadoc-plugin-3.0.1/debian/patches/series 2018-07-30 08:56:25.000000000 +0000 +++ maven-javadoc-plugin-3.0.1/debian/patches/series 2019-02-19 11:24:11.000000000 +0000 @@ -3,3 +3,5 @@ openjdk-9-javadoc-path.patch plexus-component-metadata-plugin-version.patch ignore-source-errors.patch +#plexus-utils.patch +default-detectJavaApiLink-to-false.patch