This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 29a5dd7c9500c43ff4b6854e0718827e91abebbc Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sat Nov 14 20:47:40 2026 +0100 Use the plugin's own tree classes after the maven-dependency-tree removal --- .../apache/maven/plugins/dependency/tree/TreeTokens.java | 3 +-- .../apache/maven/plugins/dependency/tree/TestTreeMojo.java | 13 +++++++------ .../maven/plugins/dependency/tree/TreeTokensTest.java | 3 +-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/TreeTokens.java b/src/main/java/org/apache/maven/plugins/dependency/tree/TreeTokens.java index ecc513ed..189a6171 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/tree/TreeTokens.java +++ b/src/main/java/org/apache/maven/plugins/dependency/tree/TreeTokens.java @@ -24,8 +24,7 @@ import java.util.Map; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.logging.Log; -import org.apache.maven.shared.dependency.graph.traversal.SerializingDependencyNodeVisitor; -import org.apache.maven.shared.dependency.graph.traversal.SerializingDependencyNodeVisitor.GraphTokens; +import org.apache.maven.plugins.dependency.tree.SerializingDependencyNodeVisitor.GraphTokens; /** Selects text tree tokens using Maven's optional execution-request output metadata. */ final class TreeTokens { diff --git a/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java b/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java index 469e71c9..c82c45f0 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java @@ -106,10 +106,10 @@ class TestTreeMojo { capabilities.put("encoding", "UTF-8"); session.getRequest().getData().put("maven.logging.outputCapabilities", capabilities); - DefaultDependencyNode root = - new DefaultDependencyNode(stubFactory.createArtifact("testGroupId", "project", "1.0")); - DefaultDependencyNode child = - new DefaultDependencyNode(stubFactory.createArtifact("testGroupId", "child", "1.0")); + Artifact rootArtifact = stubFactory.createArtifact("testGroupId", "project", "1.0"); + Artifact childArtifact = stubFactory.createArtifact("testGroupId", "child", "1.0"); + DependencyNode root = new DependencyNode(null, rootArtifact, rootArtifact.toString()); + DependencyNode child = new DependencyNode(root, childArtifact, childArtifact.toString()); child.setChildren(Collections.emptyList()); root.setChildren(Collections.singletonList(child)); StringWriter writer = new StringWriter(); @@ -122,12 +122,13 @@ class TestTreeMojo { void nonTextFormatsSkipCapabilityLookup() throws Exception { MavenSession unusedSession = mock(MavenSession.class); TreeMojo mojo = new TreeMojo(null, unusedSession, null, null); - String[] formats = {"dot", "graphml", "tgf", "json"}; + String[] formats = {"dot", "graphml", "tgf", "json", "mermaid"}; Class<?>[] visitors = { DOTDependencyNodeVisitor.class, GraphmlDependencyNodeVisitor.class, TGFDependencyNodeVisitor.class, - JsonDependencyNodeVisitor.class + JsonDependencyNodeVisitor.class, + MermaidDependencyNodeVisitor.class }; for (int i = 0; i < formats.length; i++) { setVariableValueToObject(mojo, "outputType", formats[i]); diff --git a/src/test/java/org/apache/maven/plugins/dependency/tree/TreeTokensTest.java b/src/test/java/org/apache/maven/plugins/dependency/tree/TreeTokensTest.java index c6a14c9b..59dbfc25 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/tree/TreeTokensTest.java +++ b/src/test/java/org/apache/maven/plugins/dependency/tree/TreeTokensTest.java @@ -28,8 +28,7 @@ import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.logging.Log; -import org.apache.maven.shared.dependency.graph.traversal.SerializingDependencyNodeVisitor; -import org.apache.maven.shared.dependency.graph.traversal.SerializingDependencyNodeVisitor.GraphTokens; +import org.apache.maven.plugins.dependency.tree.SerializingDependencyNodeVisitor.GraphTokens; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource;
