From 994135a14288a40d9a5a52c2ceb8437dce227394 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 13 Aug 2025 05:58:16 -0400 Subject: [PATCH 1/2] clean up a few unthrown exceptions --- .../apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java | 3 +-- .../java/org/apache/maven/plugins/javadoc/JavadocUtil.java | 2 +- .../maven/plugins/javadoc/resolver/ResourceResolver.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) 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 999fb3092..f64676faf 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java @@ -2412,9 +2412,8 @@ private boolean isNewClassFromLastVersion(JavaClass javaClass) { * @param javaExecutable a given method not null * @return true if Clirr said that this method is added from the last version, * false otherwise or if {@link #clirrNewMethods} is null. - * @throws MojoExecutionException if any */ - private boolean isNewMethodFromLastRevision(JavaExecutable javaExecutable) throws MojoExecutionException { + private boolean isNewMethodFromLastRevision(JavaExecutable javaExecutable) { if (clirrNewMethods == null) { return false; } 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 4d2723822..9d6820eed 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java @@ -372,7 +372,7 @@ protected static Collection getExcludedPackages( try { Files.walkFileTree(sourceDirectory, new SimpleFileVisitor() { @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { if (file.getFileName().toString().endsWith(".java")) { fileList.add( sourceDirectory.relativize(file.getParent()).toString()); diff --git a/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java b/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java index 51d814b7b..b9bf1c273 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java @@ -289,14 +289,13 @@ private org.eclipse.aether.artifact.Artifact createResourceArtifact( * @param propagateErrors * @return list of * @throws ArtifactResolutionException if an exception occurs - * @throws ArtifactNotFoundException if an exception occurs */ private Collection resolveAndUnpack( final List artifacts, final SourceResolverConfig config, final List validClassifiers, final boolean propagateErrors) - throws ArtifactResolutionException, ArtifactNotFoundException { + throws ArtifactResolutionException { // NOTE: Since these are '-sources' and '-test-sources' artifacts, they won't actually // resolve transitively...this is just used to aggregate resolution failures into a single // exception. From 84da2d100507c16b01a544593ae2d009af2635a4 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 13 Aug 2025 06:16:54 -0400 Subject: [PATCH 2/2] catch --- .../apache/maven/plugins/javadoc/resolver/ResourceResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java b/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java index b9bf1c273..31b68956f 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java @@ -222,7 +222,7 @@ private List resolveBundlesFromArtifacts( Collection dirs = new ArrayList<>(toResolve.size()); try { dirs = resolveAndUnpack(toResolve, config, RESOURCE_VALID_CLASSIFIERS, false); - } catch (ArtifactResolutionException | ArtifactNotFoundException e) { + } catch (ArtifactResolutionException e) { if (LOGGER.isDebugEnabled()) { LOGGER.debug(e.getMessage(), e); }