This is an automated email from the ASF dual-hosted git repository. olamy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit ff9aee52511188d4b6be0a7089e1b885d40e427e Author: olivier lamy <ol...@apache.org> AuthorDate: Fri Dec 29 21:53:54 2017 +1100 [MJAVADOC-508] add it test and fix bloody checkstyle :-) Signed-off-by: olivier lamy <ol...@apache.org> --- src/it/projects/MJAVADOC-508/invoker.properties | 19 +++++++++ src/it/projects/MJAVADOC-508/pom.xml | 48 ++++++++++++++++++++++ .../src/main/java/foo/bar/ALotOfLinkTags.java | 35 ++++++++++++++++ .../maven/plugins/javadoc/AbstractJavadocMojo.java | 5 ++- 4 files changed, 106 insertions(+), 1 deletion(-) diff --git a/src/it/projects/MJAVADOC-508/invoker.properties b/src/it/projects/MJAVADOC-508/invoker.properties new file mode 100644 index 0000000..5068e6e --- /dev/null +++ b/src/it/projects/MJAVADOC-508/invoker.properties @@ -0,0 +1,19 @@ +# 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 +invoker.buildResult = failure diff --git a/src/it/projects/MJAVADOC-508/pom.xml b/src/it/projects/MJAVADOC-508/pom.xml new file mode 100644 index 0000000..e0e222f --- /dev/null +++ b/src/it/projects/MJAVADOC-508/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-508</artifactId> + <version>1.0-SNAPSHOT</version> + + <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>@pom.version@</version> + <configuration> + <failOnWarnings>true</failOnWarnings> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + +</project> diff --git a/src/it/projects/MJAVADOC-508/src/main/java/foo/bar/ALotOfLinkTags.java b/src/it/projects/MJAVADOC-508/src/main/java/foo/bar/ALotOfLinkTags.java new file mode 100644 index 0000000..2605006 --- /dev/null +++ b/src/it/projects/MJAVADOC-508/src/main/java/foo/bar/ALotOfLinkTags.java @@ -0,0 +1,35 @@ +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. + */ + +import java.util.HashSet; +import java.util.*; +public class ALotOfLinkTags +{ + + + /** + */ + public boolean aMethod( String[] args ) + { + return true; + } + +} 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 46e9856..9897f83 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -128,7 +128,10 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.apache.maven.plugins.javadoc.JavadocUtil.*; +import static org.apache.maven.plugins.javadoc.JavadocUtil.toRelative; +import static org.apache.maven.plugins.javadoc.JavadocUtil.toList; +import static org.apache.maven.plugins.javadoc.JavadocUtil.isEmpty; +import static org.apache.maven.plugins.javadoc.JavadocUtil.isNotEmpty; import static org.codehaus.plexus.util.IOUtil.close; /** -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" <commits@maven.apache.org>.