From 81fbe2197f0522c5572daa9ac40a482ef375eecf Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 9 Nov 2024 18:17:09 -0500 Subject: [PATCH 1/2] use common line separator --- .../maven/plugins/dependency/ListRepositoriesMojo.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/dependency/ListRepositoriesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/ListRepositoriesMojo.java index fa067ded49..d8c5ebaf23 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/ListRepositoriesMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/ListRepositoriesMojo.java @@ -99,7 +99,7 @@ public boolean visitLeave(DependencyNode node) { })); if (repositories.isEmpty()) { - getLog().info("No remote repository is used by this build." + System.lineSeparator()); + getLog().info("No remote repository is used by this build.\n"); return; } @@ -132,16 +132,16 @@ private void prepareRemoteMirrorRepositoriesList( .append(repo) .append(" mirrored by ") .append(mirror) - .append(System.lineSeparator())); + .append("\n")); } private void prepareRemoteRepositoriesList( StringBuilder message, Collection remoteProjectRepositories) { - message.append("Project remote repositories used by this build:").append(System.lineSeparator()); + message.append("Project remote repositories used by this build:\n"); remoteProjectRepositories.forEach( - repo -> message.append(" * ").append(repo).append(System.lineSeparator())); + repo -> message.append(" * ").append(repo).append("\n")); } private Map getMirroredRepo(Set repositories) { From 7b840ae270f975e734855b54ec8704a1921ccb9d Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 9 Nov 2024 18:38:04 -0500 Subject: [PATCH 2/2] Use linefeed directly to avoid platform dependent code --- .../dependency/PurgeLocalRepositoryMojo.java | 8 +++----- .../analyze/AbstractAnalyzeMojo.java | 6 +++--- .../fromDependencies/BuildClasspathMojo.java | 2 +- .../resolvers/ResolveDependenciesMojo.java | 19 ++++++------------- .../resolvers/ResolvePluginsMojo.java | 13 +++++-------- .../tree/DOTDependencyNodeVisitor.java | 2 +- .../tree/GraphmlDependencyNodeVisitor.java | 8 ++++---- .../AbstractDependencyMojoTestCase.java | 2 +- .../analyze/TestAnalyzeDuplicateMojo.java | 14 ++++++-------- .../exclusion/AnalyzeExclusionsMojoTest.java | 16 +++++----------- .../ResolveDependenciesMojoTest.java | 2 +- .../dependency/utils/TestDependencyUtil.java | 3 +-- 12 files changed, 37 insertions(+), 58 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java index c678faf40b..29f4f35c57 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java @@ -623,13 +623,11 @@ private void reResolveArtifacts(MavenProject theProject, Set artifacts } if (!missingArtifacts.isEmpty()) { - StringBuilder message = new StringBuilder("required artifacts missing:"); - message.append(System.lineSeparator()); + StringBuilder message = new StringBuilder("required artifacts missing:\n"); for (Artifact missingArtifact : missingArtifacts) { - message.append(" ").append(missingArtifact.getId()).append(System.lineSeparator()); + message.append(" ").append(missingArtifact.getId()).append("\n"); } - message.append(System.lineSeparator()); - message.append("for the artifact:"); + message.append("\nfor the artifact:"); throw new ArtifactResolutionException( message.toString(), theProject.getArtifact(), theProject.getRemoteArtifactRepositories()); diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java index ebff3dcea4..0922b34d28 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java @@ -527,7 +527,7 @@ private void writeDependencyXML(Set artifacts) { writer.endElement(); } - getLog().info(System.lineSeparator() + out.getBuffer()); + getLog().info("\n" + out.getBuffer()); } } @@ -552,9 +552,9 @@ private void writeScriptableOutput(Set artifacts) { .append(artifact.getBaseVersion()) .append(":") .append(artifact.getScope()) - .append(System.lineSeparator()); + .append("\n"); } - getLog().info(System.lineSeparator() + buf); + getLog().info("\n" + buf); } } diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java index 698c2739e8..b7c342afab 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java @@ -228,7 +228,7 @@ protected void doExecute() throws MojoExecutionException { } if (outputFile == null) { - getLog().info("Dependencies classpath:" + System.lineSeparator() + cpString); + getLog().info("Dependencies classpath:\n" + cpString); } else { if (regenerateFile || !isUpToDate(cpString)) { storeClasspathFile(cpString, outputFile); diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java index 6f49a47677..cb94b0767c 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java @@ -142,13 +142,10 @@ protected ArtifactsFilter getMarkedArtifactFilter() { */ public String getOutput(boolean outputAbsoluteArtifactFilename, boolean theOutputScope, boolean theSort) { StringBuilder sb = new StringBuilder(); - sb.append(System.lineSeparator()); - sb.append("The following files have been resolved:"); - sb.append(System.lineSeparator()); + sb.append("\nThe following files have been resolved:\n"); if (results.getResolvedDependencies() == null || results.getResolvedDependencies().isEmpty()) { - sb.append(" none"); - sb.append(System.lineSeparator()); + sb.append(" none\n"); } else { sb.append(buildArtifactListOutput( results.getResolvedDependencies(), outputAbsoluteArtifactFilename, theOutputScope, theSort)); @@ -156,9 +153,7 @@ public String getOutput(boolean outputAbsoluteArtifactFilename, boolean theOutpu if (results.getSkippedDependencies() != null && !results.getSkippedDependencies().isEmpty()) { - sb.append(System.lineSeparator()); - sb.append("The following files were skipped:"); - sb.append(System.lineSeparator()); + sb.append("\nThe following files were skipped:\n"); Set skippedDependencies = new LinkedHashSet<>(results.getSkippedDependencies()); sb.append(buildArtifactListOutput( skippedDependencies, outputAbsoluteArtifactFilename, theOutputScope, theSort)); @@ -166,14 +161,12 @@ public String getOutput(boolean outputAbsoluteArtifactFilename, boolean theOutpu if (results.getUnResolvedDependencies() != null && !results.getUnResolvedDependencies().isEmpty()) { - sb.append(System.lineSeparator()); - sb.append("The following files have NOT been resolved:"); - sb.append(System.lineSeparator()); + sb.append("\nThe following files have NOT been resolved:\n"); Set unResolvedDependencies = new LinkedHashSet<>(results.getUnResolvedDependencies()); sb.append(buildArtifactListOutput( unResolvedDependencies, outputAbsoluteArtifactFilename, theOutputScope, theSort)); } - sb.append(System.lineSeparator()); + sb.append("\n"); return sb.toString(); } @@ -224,7 +217,7 @@ private StringBuilder buildArtifactListOutput( } } } - artifactStringList.add(messageBuilder + System.lineSeparator()); + artifactStringList.add(messageBuilder + "\n"); } if (theSort) { Collections.sort(artifactStringList); diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java index 4c6e91ac34..5366fa6ab5 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java @@ -79,12 +79,9 @@ protected void doExecute() throws MojoExecutionException { final Set plugins = resolvePluginArtifacts(); StringBuilder sb = new StringBuilder(); - sb.append(System.lineSeparator()); - sb.append("The following plugins have been resolved:"); - sb.append(System.lineSeparator()); + sb.append("\nThe following plugins have been resolved:\n"); if (plugins == null || plugins.isEmpty()) { - sb.append(" none"); - sb.append(System.lineSeparator()); + sb.append(" none\n"); } else { for (Artifact plugin : plugins) { String artifactFilename = null; @@ -103,7 +100,7 @@ protected void doExecute() throws MojoExecutionException { sb.append(" ") .append(id) .append(outputAbsoluteArtifactFilename ? ":" + artifactFilename : "") - .append(System.lineSeparator()); + .append("\n"); if (!excludeTransitive) { DefaultDependableCoordinate pluginCoordinate = new DefaultDependableCoordinate(); @@ -128,11 +125,11 @@ protected void doExecute() throws MojoExecutionException { sb.append(" ") .append(id) .append(outputAbsoluteArtifactFilename ? ":" + artifactFilename : "") - .append(System.lineSeparator()); + .append("\n"); } } } - sb.append(System.lineSeparator()); + sb.append("\n"); String output = sb.toString(); if (outputFile == null) { diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/DOTDependencyNodeVisitor.java b/src/main/java/org/apache/maven/plugins/dependency/tree/DOTDependencyNodeVisitor.java index 238a62ae6a..c8f8aeaf91 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/tree/DOTDependencyNodeVisitor.java +++ b/src/main/java/org/apache/maven/plugins/dependency/tree/DOTDependencyNodeVisitor.java @@ -48,7 +48,7 @@ public DOTDependencyNodeVisitor(Writer writer) { @Override public boolean visit(DependencyNode node) { if (node.getParent() == null || node.getParent() == node) { - writer.write("digraph \"" + node.toNodeString() + "\" { " + System.lineSeparator()); + writer.write("digraph \"" + node.toNodeString() + "\" { \n"); } // Generate "currentNode -> Child" lines diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/GraphmlDependencyNodeVisitor.java b/src/main/java/org/apache/maven/plugins/dependency/tree/GraphmlDependencyNodeVisitor.java index 77c55c4131..3b15860571 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/tree/GraphmlDependencyNodeVisitor.java +++ b/src/main/java/org/apache/maven/plugins/dependency/tree/GraphmlDependencyNodeVisitor.java @@ -40,10 +40,10 @@ public class GraphmlDependencyNodeVisitor extends AbstractSerializingVisitor imp + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " + "xmlns:y=\"http://www.yworks.com/xml/graphml\" " + "xsi:schemaLocation=\"http://graphml.graphdrawing.org/xmlns " - + "http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd\">" + System.lineSeparator() - + " " + System.lineSeparator() - + " " + System.lineSeparator() - + "" + System.lineSeparator(); + + "http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd\">\n" + + " \n" + + " \n" + + "\n"; /** * Graphml xml file footer. diff --git a/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java b/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java index fc8eacc053..961fd27b31 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java +++ b/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java @@ -67,7 +67,7 @@ protected void tearDown() { FileUtils.deleteDirectory(testDir); } catch (IOException e) { e.printStackTrace(); - fail("Trying to remove directory: " + testDir + System.lineSeparator() + e); + fail("Trying to remove directory: " + testDir + "\n" + e); } assertFalse(testDir.exists()); } diff --git a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDuplicateMojo.java b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDuplicateMojo.java index 339d2b6465..926d5ae93f 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDuplicateMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDuplicateMojo.java @@ -122,7 +122,7 @@ public void warn(Throwable error) { /** {@inheritDoc} */ public void error(CharSequence content) { - System.err.println("[error] " + content.toString()); + System.err.println("[error] " + content); } /** {@inheritDoc} */ @@ -132,8 +132,7 @@ public void error(CharSequence content, Throwable error) { error.printStackTrace(pWriter); - System.err.println( - "[error] " + content.toString() + System.lineSeparator() + System.lineSeparator() + sWriter); + System.err.println("[error] " + content + "\n\n" + sWriter); } /** @@ -182,7 +181,7 @@ private void print(String prefix, CharSequence content) { .append(prefix) .append("] ") .append(content.toString()) - .append(System.lineSeparator()); + .append("\n"); } private void print(String prefix, Throwable error) { @@ -191,7 +190,7 @@ private void print(String prefix, Throwable error) { error.printStackTrace(pWriter); - sb.append("[").append(prefix).append("] ").append(sWriter).append(System.lineSeparator()); + sb.append("[").append(prefix).append("] ").append(sWriter).append("\n"); } private void print(String prefix, CharSequence content, Throwable error) { @@ -204,9 +203,8 @@ private void print(String prefix, CharSequence content, Throwable error) { .append(prefix) .append("] ") .append(content.toString()) - .append(System.lineSeparator()) - .append(System.lineSeparator()); - sb.append(sWriter).append(System.lineSeparator()); + .append("\n\n"); + sb.append(sWriter).append("\n"); } protected String getContent() { diff --git a/src/test/java/org/apache/maven/plugins/dependency/exclusion/AnalyzeExclusionsMojoTest.java b/src/test/java/org/apache/maven/plugins/dependency/exclusion/AnalyzeExclusionsMojoTest.java index bbcc748574..3bb346ce9b 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/exclusion/AnalyzeExclusionsMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/dependency/exclusion/AnalyzeExclusionsMojoTest.java @@ -306,8 +306,7 @@ public void error(CharSequence content, Throwable error) { error.printStackTrace(pWriter); - System.err.println( - "[error] " + content.toString() + System.lineSeparator() + System.lineSeparator() + sWriter); + System.err.println("[error] " + content + "\n\n" + sWriter); } /** @@ -356,7 +355,7 @@ private void print(String prefix, CharSequence content) { .append(prefix) .append("] ") .append(content.toString()) - .append(System.lineSeparator()); + .append("\n"); } private void print(String prefix, Throwable error) { @@ -365,7 +364,7 @@ private void print(String prefix, Throwable error) { error.printStackTrace(pWriter); - sb.append("[").append(prefix).append("] ").append(sWriter).append(System.lineSeparator()); + sb.append("[").append(prefix).append("] ").append(sWriter).append("\n\n"); } private void print(String prefix, CharSequence content, Throwable error) { @@ -374,13 +373,8 @@ private void print(String prefix, CharSequence content, Throwable error) { error.printStackTrace(pWriter); - sb.append("[") - .append(prefix) - .append("] ") - .append(content.toString()) - .append(System.lineSeparator()) - .append(System.lineSeparator()); - sb.append(sWriter).append(System.lineSeparator()); + sb.append("[").append(prefix).append("] ").append(content).append("\n\n"); + sb.append(sWriter).append("\n"); } protected String getContent() { diff --git a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java index a9d3c6077d..03570159d1 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java @@ -57,7 +57,7 @@ public void testOptionalDependencyFormatting() throws IOException { ResolveDependenciesMojo mojo = newMojo(new DependencyStatusSets()); mojo.results.setResolvedDependencies(set); String output = mojo.getOutput(false, true, false); - assertTrue(output.contains("g:a:jar:1.0:test (optional)" + System.lineSeparator())); + assertTrue(output.contains("g:a:jar:1.0:test (optional)\n")); } public void doTestDependencyStatusLog(Set artifacts) { diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java b/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java index ceaa05a763..7b8851f13d 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java +++ b/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java @@ -39,8 +39,7 @@ */ class TestDependencyUtil { - private static final String TEST_CONTENT = - "Test line 1" + System.lineSeparator() + "Test line 2" + System.lineSeparator(); + private static final String TEST_CONTENT = "Test line 1\n" + "Test line 2\n"; @TempDir File temDir;