This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 38664c4a [MDEP-974] strip ansi codes when writing to a file (#1564)
38664c4a is described below
commit 38664c4a51a48205edd10a5b4bc29fb150707d0d
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Fri Dec 19 18:26:17 2025 +0000
[MDEP-974] strip ansi codes when writing to a file (#1564)
* strip ansi codes when writing to a file
* Correct test name
* expected output depends on whether we have a version of Java that
supports modules or not
---
pom.xml | 8 +++++++-
src/it/projects/mdep-839-list/pom.xml | 2 +-
src/it/projects/mdep-839-list/verify.groovy | 13 ++++++++++++-
.../dependency/resolvers/ResolveDependenciesMojo.java | 11 +++++------
4 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6b79c5ce..1adbdf52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -366,7 +366,12 @@ under the License.
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>2.4.2</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
@@ -452,6 +457,7 @@ under the License.
<failOnWarning>true</failOnWarning>
<ignoredUnusedDeclaredDependencies combine.children="append">
<!-- used in tests runtime -->
+
<ignoredUnusedDeclaredDependency>org.fusesource.jansi:jansi</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.maven.resolver:maven-resolver-connector-basic</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.maven.resolver:maven-resolver-transport-file</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.maven.resolver:maven-resolver-transport-http</ignoredUnusedDeclaredDependency>
diff --git a/src/it/projects/mdep-839-list/pom.xml
b/src/it/projects/mdep-839-list/pom.xml
index f6cd8606..264232ba 100644
--- a/src/it/projects/mdep-839-list/pom.xml
+++ b/src/it/projects/mdep-839-list/pom.xml
@@ -29,7 +29,7 @@
<name>Test</name>
<description>
- Test dependency:list-repositories
+ Test dependency:list
</description>
<properties>
diff --git a/src/it/projects/mdep-839-list/verify.groovy
b/src/it/projects/mdep-839-list/verify.groovy
index 50cd4ea0..06d9a243 100644
--- a/src/it/projects/mdep-839-list/verify.groovy
+++ b/src/it/projects/mdep-839-list/verify.groovy
@@ -19,10 +19,21 @@
File file = new File( basedir, "classpath.txt" )
assert file.exists() : "output file $file does not exist"
-
String output = file.getText( "UTF-8" )
assert output.startsWith( 'The following files have been resolved:')
// no escape codes
assert !output.contains( '\u001B' )
+// expected output depends on whether we have a version of Java that supports
modules or not
+def javaVersion = System.getProperty("java.specification.version")
+def majorVersion = (javaVersion.startsWith("1.") ? javaVersion.split("\\.")[1]
: javaVersion).toInteger()
+
+if (majorVersion >= 9) {
+ assert output.contains('compile -- module') : "Output should contain
module compilation info on Java 9+"
+} else {
+ assert output.contains( 'compile' )
+}
+
+
+
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 b9bf0fb5..2df7d91c 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
@@ -205,11 +205,6 @@ public class ResolveDependenciesMojo extends
AbstractResolveMojo {
Set<Artifact> artifacts, boolean outputAbsoluteArtifactFilename,
boolean theOutputScope, boolean theSort) {
StringBuilder sb = new StringBuilder();
List<String> artifactStringList = new ArrayList<>();
- /* if (outputFile != null) {
- MessageUtils.setColorEnabled(false);
- } else {
- MessageUtils.setColorEnabled(true);
- } */
for (Artifact artifact : artifacts) {
MessageBuilder messageBuilder = MessageUtils.buffer();
messageBuilder.a(" ");
@@ -251,7 +246,11 @@ public class ResolveDependenciesMojo extends
AbstractResolveMojo {
}
}
}
- artifactStringList.add(messageBuilder.build() +
System.lineSeparator());
+ String message = messageBuilder.build();
+ if (outputFile != null) {
+ message = MessageUtils.stripAnsiCodes(message);
+ }
+ artifactStringList.add(message + System.lineSeparator());
}
if (theSort) {
Collections.sort(artifactStringList);
