Skip to content

Commit f489889

Browse files
committed
fix format violations
1 parent b783ea5 commit f489889

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
import java.io.ByteArrayOutputStream;
2424
import java.io.File;
2525
import java.io.IOException;
26+
import java.io.OutputStreamWriter;
27+
import java.io.Writer;
28+
import java.nio.charset.StandardCharsets;
2629
import java.nio.file.DirectoryStream;
2730
import java.nio.file.FileVisitResult;
2831
import java.nio.file.Files;
@@ -80,7 +83,7 @@
8083
import org.apache.maven.model.Plugin;
8184
import org.apache.maven.model.PluginExecution;
8285
import org.apache.maven.model.Resource;
83-
import org.apache.maven.model.io.DefaultModelWriter;
86+
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
8487
import org.apache.maven.project.MavenProject;
8588
import org.eclipse.aether.RepositorySystem;
8689
import org.eclipse.aether.artifact.DefaultArtifactType;
@@ -213,6 +216,8 @@ public ProjectsInputInfo calculateChecksum() throws IOException {
213216
projectVersion.setIsText("yes");
214217
projectVersion.setValue(project.getVersion());
215218
items.add(projectVersion);
219+
220+
checksum.update(project.getVersion().getBytes(StandardCharsets.UTF_8));
216221
}
217222

218223
DigestItem effectivePomChecksum = DigestUtils.pom(checksum, effectivePom);
@@ -336,13 +341,14 @@ private boolean checkItemMatchesBaseline(ProjectsInputInfo baselineBuild, Digest
336341
*/
337342
private String getEffectivePom(Model prototype) throws IOException {
338343
ByteArrayOutputStream output = new ByteArrayOutputStream();
339-
new DefaultModelWriter().write(output, Collections.emptyMap(), prototype);
344+
try (Writer writer = new OutputStreamWriter(output, StandardCharsets.UTF_8)) {
345+
new MavenXpp3Writer().write(output, prototype);
346+
}
340347

341348
// normalize env specifics
342349
final String[] searchList = {baseDirPath.toString(), "\\", "windows", "linux"};
343350
final String[] replacementList = {"", "/", "os.classifier", "os.classifier"};
344351

345-
//Normalize output to ensure consistent encoding, line ending, and whitespace
346352
String result = output.toString(java.nio.charset.StandardCharsets.UTF_8.name());
347353
result = result.replace("\r\n", "\n");
348354
result = result.trim();

0 commit comments

Comments
 (0)