Skip to content

fix: normalize lockfiles for Windows #1556

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

Merged
algomaster99 merged 2 commits into from
May 11, 2026
Merged

fix: normalize lockfiles for Windows #1556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7b8250
fix: normalize lockfiles for Windows
joemorris-ncsu Apr 29, 2026
ce494e3
fix: relative dir generation
joemorris-ncsu May 11, 2026
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
16 changes: 11 additions & 5 deletions maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/LockFileFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.nio.file.Path;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
Expand Down Expand Up @@ -517,11 +518,16 @@ private static Pom constructRecursivePom(

String relativePath = isExternalPom
? null
: initialProject
.getBasedir()
.toPath()
.relativize(project.getFile().toPath())
.toString();
: StreamSupport.stream(
initialProject
.getBasedir()
.toPath()
.relativize(project.getFile().toPath())
.spliterator(),
false)
.map(Path::toString)
.collect(Collectors.joining("/"));

String checksum;
ResolvedUrl resolved = null;
RepositoryId repoId = null;
Expand Down
11 changes: 9 additions & 2 deletions ...ain/java/io/github/chains_project/maven_lockfile/checksum/AbstractChecksumCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.common.io.BaseEncoding;
import io.github.chains_project.maven_lockfile.reporting.PluginLogManager;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
Expand Down Expand Up @@ -49,8 +50,14 @@ public void prewarmArtifactCache(Collection<Artifact> artifacts) {
public String calculatePomChecksum(Path path) {
try {
MessageDigest messageDigest = MessageDigest.getInstance(checksumAlgorithm);
byte[] fileBuffer = Files.readAllBytes(path);
byte[] artifactHash = messageDigest.digest(fileBuffer);

// normalize line endings to prevent false-positives on checksum mismatch
byte[] normalizedBytes = Files.readString(path)
.replace("\r\n", "\n")
.replace("\r", "\n")
.getBytes(StandardCharsets.UTF_8);

byte[] artifactHash = messageDigest.digest(normalizedBytes);
BaseEncoding baseEncoding = BaseEncoding.base16();
return baseEncoding.encode(artifactHash).toLowerCase(Locale.ROOT);
} catch (Exception e) {
Expand Down
Loading