You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/11/23 17:32:27 UTC
[maven-javadoc-plugin] 01/02: Fix FixJavadocTest tests for Java 10+
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-542
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit f398681ba28b1c3694874bf7fdadc7c6a6ab7ea6
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Nov 23 12:16:04 2018 +0100
Fix FixJavadocTest tests for Java 10+
---
pom.xml | 25 ----------------------
.../plugins/javadoc/AbstractFixJavadocMojo.java | 4 ++--
2 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index cd6cc3b..2cb684d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,31 +343,6 @@ under the License.
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <ignoreClasses>
- <ignoreClass>module-info</ignoreClass>
- </ignoreClasses>
- </enforceBytecodeVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.0-beta-6</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<executions>
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
index 1036095..42bef47 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
@@ -2190,14 +2190,14 @@ public abstract class AbstractFixJavadocMojo
if ( clazz != null )
{
- if ( ClassUtils.isAssignable( clazz, RuntimeException.class ) )
+ if ( RuntimeException.class.isAssignableFrom( clazz ) )
{
sb.append( StringUtils.replace( originalJavadocTag, exceptionClassName, clazz.getName() ) );
// added qualified name
javaEntityTags.putJavadocThrowsTag( clazz.getName(), originalJavadocTag );
}
- else if ( ClassUtils.isAssignable( clazz, Throwable.class ) )
+ else if ( Throwable.class.isAssignableFrom( clazz ) )
{
getLog().debug( "Removing '" + originalJavadocTag + "'; Throwable not specified by "
+ getJavaMethodAsString( javaExecutable ) + " and it is not a RuntimeException." );