Skip to content

Commit b783ea5

Browse files
committed
fix jdk 17 test failures
1 parent 6a41be9 commit b783ea5

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,13 @@ private String getEffectivePom(Model prototype) throws IOException {
341341
// normalize env specifics
342342
final String[] searchList = {baseDirPath.toString(), "\\", "windows", "linux"};
343343
final String[] replacementList = {"", "/", "os.classifier", "os.classifier"};
344-
return replaceEachRepeatedly(
345-
output.toString(java.nio.charset.StandardCharsets.UTF_8.name()), searchList, replacementList);
344+
345+
//Normalize output to ensure consistent encoding, line ending, and whitespace
346+
String result = output.toString(java.nio.charset.StandardCharsets.UTF_8.name());
347+
result = result.replace("\r\n", "\n");
348+
result = result.trim();
349+
350+
return replaceEachRepeatedly(result, searchList, replacementList);
346351
}
347352

348353
private SortedSet<Path> getInputFiles() {

0 commit comments

Comments
 (0)