From commits-return-69309-archive-asf-public=cust-asf.ponee.io@maven.apache.org Sat Jan 6 15:22:21 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 37F7D18062C for ; Sat, 6 Jan 2018 15:22:21 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2810D160C3B; Sat, 6 Jan 2018 14:22:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6EA34160C2A for ; Sat, 6 Jan 2018 15:22:20 +0100 (CET) Received: (qmail 601 invoked by uid 500); 6 Jan 2018 14:22:19 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 592 invoked by uid 99); 6 Jan 2018 14:22:19 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Jan 2018 14:22:19 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 7C0B28820B; Sat, 6 Jan 2018 14:22:18 +0000 (UTC) Date: Sat, 06 Jan 2018 14:22:18 +0000 To: "commits@maven.apache.org" Subject: [maven-javadoc-plugin] branch master updated: Introduce consumer to ignore lines starting with 'Picked up ' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <151524853845.31794.6224797889009243527@gitbox.apache.org> From: rfscholte@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: maven-javadoc-plugin X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9809cf172071db21fd0f0482d944fd963dd2a2b3 X-Git-Newrev: 12dbbde29cf6277ca311cb8afffdf02dbfe0c9b4 X-Git-Rev: 12dbbde29cf6277ca311cb8afffdf02dbfe0c9b4 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git The following commit(s) were added to refs/heads/master by this push: new 12dbbde Introduce consumer to ignore lines starting with 'Picked up ' 12dbbde is described below commit 12dbbde29cf6277ca311cb8afffdf02dbfe0c9b4 Author: rfscholte AuthorDate: Sat Jan 6 15:22:11 2018 +0100 Introduce consumer to ignore lines starting with 'Picked up ' --- .../apache/maven/plugins/javadoc/JavadocUtil.java | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java index f575455..73ae0f2 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java @@ -525,8 +525,8 @@ public class JavadocUtil cmd.setWorkingDirectory( javadocExe.getParentFile() ); cmd.createArg().setValue( "-J-version" ); - CommandLineUtils.StringStreamConsumer out = new CommandLineUtils.StringStreamConsumer(); - CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer(); + CommandLineUtils.StringStreamConsumer out = new JavadocOutputStreamConsumer(); + CommandLineUtils.StringStreamConsumer err = new JavadocOutputStreamConsumer(); int exitCode = CommandLineUtils.executeCommandLine( cmd, out, err ); @@ -1512,6 +1512,24 @@ public class JavadocUtil return token; } } + + /** + * Ignores line like 'Picked up JAVA_TOOL_OPTIONS: ...' as can happen on CI servers. + * + * @author Robert Scholte + * @since 3.0.1 + */ + private static class JavadocOutputStreamConsumer extends CommandLineUtils.StringStreamConsumer + { + @Override + public void consumeLine( String line ) + { + if ( !line.startsWith( "Picked up " ) ) + { + super.consumeLine( line ); + } + } + } static List toList( String src ) { -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" '].