Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the crash repored in #1858 #1859

Merged
merged 4 commits into from
Nov 2, 2023
Merged

fix the crash repored in #1858 #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f237fd4
fix the crash #1858 when the maven build dir is a softlink to an actu…
243826 Oct 23, 2023
34a14cd
Fix missing import.
nedtwigg Nov 2, 2023
7321d6f
Update changelog.
nedtwigg Nov 2, 2023
70e0015
Merge branch 'main' into main
nedtwigg Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions plugin-maven/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).

## [Unreleased]
### Changes
* Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))

### Added
* CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
### Fixed
* Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))
### Changes
* Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))

## [2.40.0] - 2023-09-28
### Added
Expand Down
10 changes: 9 additions & 1 deletion plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.io.PrintWriter;
import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Instant;
Expand Down Expand Up @@ -144,7 +145,14 @@ private void ensureParentDirExists() {
throw new IllegalStateException("Index file does not have a parent dir: " + indexFile);
}
try {
Files.createDirectories(parentDir);
if (Files.exists(parentDir, LinkOption.NOFOLLOW_LINKS)) {
Path realPath = parentDir.toRealPath();
if (!Files.exists(realPath)) {
Files.createDirectories(realPath);
}
} else {
Files.createDirectories(parentDir);
}
} catch (IOException e) {
throw new UncheckedIOException("Unable to create parent directory for the index file: " + indexFile, e);
}
Expand Down