[Git][java-team/maven-javadoc-plugin][master] 5 commits: Debian #914411: build against latest plexus-utils

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / maven-javadoc-plugin


Commits:
cbca996e by tony mancill at 2018-11-24T18:11:36Z
Debian #914411: build against latest plexus-utils

- - - - -
82817d4c by tony mancill at 2018-11-24T18:12:34Z
Bump Standards-Version to 4.2.1

- - - - -
37a4908c by tony mancill at 2018-11-24T18:17:00Z
Update Homepage URL to use https

- - - - -
8936f22a by tony mancill at 2018-11-24T18:17:00Z
add myself to debian/copyright

- - - - -
1f015d9e by tony mancill at 2018-11-24T18:18:51Z
prepare changelog for upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/plexus-utils.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+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 <tmancill at debian.org>  Sat, 24 Nov 2018 10:17:09 -0800
+
 maven-javadoc-plugin (3.0.1-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -24,10 +24,10 @@ Build-Depends:
  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


=====================================
debian/copyright
=====================================
@@ -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 @@ Copyright: 2009, Ludovic Claude <ludovic.claude at laposte.net>
            2010, Torsten Werner <twerner at debian.org>
            2011, Miguel Landaeta <nomadium at debian.org>
            2013-2018, Emmanuel Bourg <ebourg at apache.org>
+           2018, tony mancill <tmancill at debian.org>
 License: GPL-3+
 
 License: GPL-3+


=====================================
debian/patches/plexus-utils.patch
=====================================
@@ -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
+         {


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ reproducible-footer.patch
 openjdk-9-javadoc-path.patch
 plexus-component-metadata-plugin-version.patch
 ignore-source-errors.patch
+plexus-utils.patch



View it on GitLab: https://salsa.debian.org/java-team/maven-javadoc-plugin/compare/c1f7feace2a7757d3ea3ca8aedffde5a5dd2fe8e...1f015d9e56d8a0c4f7c545d5a91a4e848c339e88

-- 
View it on GitLab: https://salsa.debian.org/java-team/maven-javadoc-plugin/compare/c1f7feace2a7757d3ea3ca8aedffde5a5dd2fe8e...1f015d9e56d8a0c4f7c545d5a91a4e848c339e88
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181124/5703b349/attachment.html>