Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MJAVADOC-538] Filter out 'Picked up' #11

Merged
merged 1 commit into from Nov 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions pom.xml
Expand Up @@ -113,6 +113,9 @@ under the License.
<contributor>
<name>Anton Klarén</name>
</contributor>
<contributor>
<name>Kevin Risden</name>
</contributor>
</contributors>

<dependencies>
Expand Down Expand Up @@ -441,6 +444,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>
risdenk marked this conversation as resolved.
Show resolved Hide resolved
</environmentVariables>
</configuration>
</plugin>
Expand Down
18 changes: 18 additions & 0 deletions 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
48 changes: 48 additions & 0 deletions 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>

risdenk marked this conversation as resolved.
Show resolved Hide resolved
<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>
risdenk marked this conversation as resolved.
Show resolved Hide resolved
</plugins>
</pluginManagement>
</build>
</project>
24 changes: 24 additions & 0 deletions 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
{
}
Expand Up @@ -5251,8 +5251,8 @@ private void executeJavadocCommandLine( Commandline cmd, File javadocOutputDirec
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 );
Expand Down
Expand Up @@ -1501,7 +1501,7 @@ public String nextToken()
* @author Robert Scholte
* @since 3.0.1
*/
private static class JavadocOutputStreamConsumer
protected static class JavadocOutputStreamConsumer
extends CommandLineUtils.StringStreamConsumer
{
@Override
Expand Down