Fix CompilerMojo#getSourceInclusionScanner(String) illogical addAll (#243)

Co-authored-by: Guillaume Nodet <gnodet@gmail.com>

Author: JackPGreen

src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java

@@ -1808,4 +1808,11 @@ public Logger getChildLogger(String name) {
             return this;
         }
     }
+
+    protected static <T> Set<T> add(Set<T> t1, Set<T> t2) {
+        Set<T> s = new HashSet<>();
+        s.addAll(t1);
+        s.addAll(t2);
+        return s;
+    }
 }

src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java

@@ -219,7 +219,7 @@ protected void preparePaths(Set<Path> sourceFiles) {
             Stream<String> s1 = Stream.of(getOutputDirectory().toString());
             Stream<String> s2 = session.resolveDependencies(getProject(), PathScope.MAIN_COMPILE).stream()
                     .map(Path::toString);
-            compilePath = Stream.concat(s1, s2).collect(Collectors.toList());
+            compilePath = Stream.concat(s1, s2).toList();
         }
 
         Path moduleDescriptorPath = null;
@@ -371,9 +371,7 @@ protected SourceInclusionScanner getSourceInclusionScanner(int staleMillis) {
             includes.add("**/*.java");
         }
 
-        Set<String> excludesIncr = new HashSet<>(excludes);
-        excludesIncr.addAll(this.incrementalExcludes);
-        return new StaleSourceScanner(staleMillis, includes, excludesIncr);
+        return new StaleSourceScanner(staleMillis, includes, add(excludes, incrementalExcludes));
     }
 
     protected SourceInclusionScanner getSourceInclusionScanner(String inputFileEnding) {
@@ -383,9 +381,7 @@ protected SourceInclusionScanner getSourceInclusionScanner(String inputFileEndin
         if (includes.isEmpty()) {
             includes.add(defaultIncludePattern);
         }
-        Set<String> excludesIncr = new HashSet<>(excludes);
-        excludesIncr.addAll(excludesIncr);
-        return new SimpleSourceInclusionScanner(includes, excludesIncr);
+        return new SimpleSourceInclusionScanner(includes, add(excludes, incrementalExcludes));
     }
 
     @Override

src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java

@@ -418,9 +418,7 @@ protected SourceInclusionScanner getSourceInclusionScanner(int staleMillis) {
             if (testIncludes.isEmpty()) {
                 testIncludes.add("**/*.java");
             }
-            Set<String> excludesIncr = new HashSet<>(testExcludes);
-            excludesIncr.addAll(this.testIncrementalExcludes);
-            scanner = new StaleSourceScanner(staleMillis, testIncludes, excludesIncr);
+            scanner = new StaleSourceScanner(staleMillis, testIncludes, add(testExcludes, testIncrementalExcludes));
         }
 
         return scanner;
@@ -439,9 +437,7 @@ protected SourceInclusionScanner getSourceInclusionScanner(String inputFileEndin
             if (testIncludes.isEmpty()) {
                 testIncludes.add(defaultIncludePattern);
             }
-            Set<String> excludesIncr = new HashSet<>(testExcludes);
-            excludesIncr.addAll(this.testIncrementalExcludes);
-            scanner = new SimpleSourceInclusionScanner(testIncludes, excludesIncr);
+            scanner = new SimpleSourceInclusionScanner(testIncludes, add(testExcludes, testIncrementalExcludes));
         }
 
         return scanner;