This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-538
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 87855990e714af4e6d38acf2f6531068c9fe81fd
Author: Kevin Risden <kris...@apache.org>
AuthorDate: Tue Nov 13 18:08:02 2018 -0500
Filter out 'Picked up'
Signed-off-by: Kevin Risden <kris...@apache.org>
---
pom.xml | 2 +
src/it/projects/MJAVADOC-538/invoker.properties | 18 ++++++++
src/it/projects/MJAVADOC-538/pom.xml | 48 ++++++++++++++++++++++
.../src/main/java/foo/bar/MyClass.java | 24 +++++++++++
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 4 +-
.../apache/maven/plugins/javadoc/JavadocUtil.java | 2 +-
6 files changed, 95 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index fa19d3e..8666b99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -441,6 +441,8 @@ under the License.
</filterProperties>
<environmentVariables>
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
+ <!-- required for MJAVADOC-538 -->
+ <_JAVA_OPTIONS>-Dabc=def</_JAVA_OPTIONS>
</environmentVariables>
</configuration>
</plugin>
diff --git a/src/it/projects/MJAVADOC-538/invoker.properties
b/src/it/projects/MJAVADOC-538/invoker.properties
new file mode 100644
index 0000000..a4e250d
--- /dev/null
+++ b/src/it/projects/MJAVADOC-538/invoker.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals=clean javadoc:javadoc
diff --git a/src/it/projects/MJAVADOC-538/pom.xml
b/src/it/projects/MJAVADOC-538/pom.xml
new file mode 100644
index 0000000..e7d3ae1
--- /dev/null
+++ b/src/it/projects/MJAVADOC-538/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>mjavadoc-538</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <url>https://issues.apache.org/jira/browse/MJAVADOC-538</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <failOnWarnings>true</failOnWarnings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/src/it/projects/MJAVADOC-538/src/main/java/foo/bar/MyClass.java
b/src/it/projects/MJAVADOC-538/src/main/java/foo/bar/MyClass.java
new file mode 100644
index 0000000..e5960e3
--- /dev/null
+++ b/src/it/projects/MJAVADOC-538/src/main/java/foo/bar/MyClass.java
@@ -0,0 +1,24 @@
+package foo.bar;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class MyClass
+{
+}
diff --git
a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index e19b68f..5dc3fd6 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -5251,8 +5251,8 @@ public abstract class AbstractJavadocMojo
writeDebugJavadocScript( cmdLine, javadocOutputDirectory );
}
- CommandLineUtils.StringStreamConsumer err = new
CommandLineUtils.StringStreamConsumer();
- CommandLineUtils.StringStreamConsumer out = new
CommandLineUtils.StringStreamConsumer();
+ CommandLineUtils.StringStreamConsumer err = new
JavadocUtil.JavadocOutputStreamConsumer();
+ CommandLineUtils.StringStreamConsumer out = new
JavadocUtil.JavadocOutputStreamConsumer();
try
{
int exitCode = CommandLineUtils.executeCommandLine( cmd, out, err
);
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 da72cac..380524e 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -1501,7 +1501,7 @@ public class JavadocUtil
* @author Robert Scholte
* @since 3.0.1
*/
- private static class JavadocOutputStreamConsumer
+ protected static class JavadocOutputStreamConsumer
extends CommandLineUtils.StringStreamConsumer
{
@Override
