diff --git a/src/main/java/org/apache/maven/plugins/javadoc/FileAccumulator.java b/src/main/java/org/apache/maven/plugins/javadoc/FileAccumulator.java
index f820b3f..ada727e 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/FileAccumulator.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/FileAccumulator.java
@@ -51,17 +51,17 @@
     }
 
     @Override
-    public FileVisitResult postVisitDirectory(Path path, IOException ex) throws IOException {
+    public FileVisitResult postVisitDirectory(Path path, IOException ex) {
         return FileVisitResult.CONTINUE;
     }
 
     @Override
-    public FileVisitResult preVisitDirectory(Path path, BasicFileAttributes arg1) throws IOException {
+    public FileVisitResult preVisitDirectory(Path path, BasicFileAttributes arg1) {
         return FileVisitResult.CONTINUE;
     }
 
     @Override
-    public FileVisitResult visitFile(Path path, BasicFileAttributes ex) throws IOException {
+    public FileVisitResult visitFile(Path path, BasicFileAttributes ex) {
         for (PathMatcher matcher : sourceFileExcludes) {
             if (matcher.matches(path)) {
                 return FileVisitResult.CONTINUE;
@@ -77,7 +77,7 @@
     }
 
     @Override
-    public FileVisitResult visitFileFailed(Path path, IOException ex) throws IOException {
+    public FileVisitResult visitFileFailed(Path path, IOException ex) {
         return FileVisitResult.CONTINUE;
     }
 
