Skip to content

Commit c7026d0

Browse files
authored
Revert "feat: Maven plugin uses CompileSourceRoots" (#1928)
2 parents 89e619b + 0990a86 commit c7026d0

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

plugin-maven/CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
44

55
## [Unreleased]
6+
### Fixed
7+
* Revert [#1846](https://github.com/diffplug/spotless/issues/1846) from 2.41.0 which causes the plugin to format generated sources in the `target` directory. ([#1928](https://github.com/diffplug/spotless/pull/1928))
68

79
## [2.41.0] - 2023-11-27
810
### Added

plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
import java.io.File;
2121
import java.nio.file.Path;
2222
import java.nio.file.Paths;
23-
import java.util.ArrayList;
24-
import java.util.List;
2523
import java.util.Set;
24+
import java.util.stream.Stream;
2625

2726
import org.apache.maven.model.Build;
2827
import org.apache.maven.project.MavenProject;
@@ -45,15 +44,7 @@ public class Java extends FormatterFactory {
4544
public Set<String> defaultIncludes(MavenProject project) {
4645
Path projectDir = project.getBasedir().toPath();
4746
Build build = project.getBuild();
48-
49-
List<String> includes = new ArrayList<>();
50-
includes.add(build.getSourceDirectory());
51-
includes.add(build.getTestSourceDirectory());
52-
includes.addAll(project.getCompileSourceRoots());
53-
includes.addAll(project.getTestCompileSourceRoots());
54-
55-
return includes.stream()
56-
.distinct()
47+
return Stream.of(build.getSourceDirectory(), build.getTestSourceDirectory())
5748
.map(Paths::get)
5849
.map(projectDir::relativize)
5950
.map(Java::fileMask)

0 commit comments

Comments
 (0)