Skip to content

Make bannedDependencies report root and transitive dependency in case both are banned. #940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hvoynov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make bannedDependencies report root and transitive dependency in case both are banned. #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ules/src/main/java/org/apache/maven/enforcer/rules/dependency/BannedDependenciesBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ protected boolean validate(
rootFailed = !validate(artifact);
}
StringBuilder childMessageBuilder = new StringBuilder();
if (rootFailed
|| !node.getChildren().stream()
if (!node.getChildren().stream()
.map(childNode -> validate(childNode, level + 1, childMessageBuilder, visitedArtifacts))
.reduce(true, Boolean::logicalAnd)) {
.reduce(true, Boolean::logicalAnd)
|| rootFailed) {
messageBuilder
.append(StringUtils.repeat(" ", level))
.append(ArtifactUtils.toArtifact(node).getId());
Expand Down
33 changes: 33 additions & 0 deletions ...ules/src/test/java/org/apache/maven/enforcer/rules/dependency/BannedDependenciesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,39 @@ void excludesAndIncludesUseTransitiveDependencies() throws Exception {
.hasMessageNotContaining("childAB");
}

@Test
void excludesReportsRootAndTransitiveDependencies() throws Exception {

when(resolverUtil.resolveTransitiveDependenciesVerbose(anyList()))
.thenReturn(new DependencyNodeBuilder()
.withType(DependencyNodeBuilder.Type.POM)
.withChildNode(new DependencyNodeBuilder()
.withArtifactId("childA")
.withVersion("1.0.0")
.withChildNode(new DependencyNodeBuilder()
.withType(DependencyNodeBuilder.Type.WAR)
.withArtifactId("childAA")
.withVersion("1.0.0-SNAPSHOT")
.withChildNode(new DependencyNodeBuilder()
.withType(DependencyNodeBuilder.Type.WAR)
.withArtifactId("childAAA")
.withVersion("1.0.0-SNAPSHOT")
.build())
.build())
.build())
.build());

rule.setSearchTransitive(true);
rule.setExcludes(Collections.singletonList("*:*:*:war"));

assertThatCode(rule::execute)
.isInstanceOf(EnforcerRuleException.class)
.hasMessageContaining(
"default-group:childAA:war:classifier:1.0.0-SNAPSHOT <--- banned via the exclude/include list")
.hasMessageContaining(
"default-group:childAAA:war:classifier:1.0.0-SNAPSHOT <--- banned via the exclude/include list");
}

@Test
void invalidExcludeFormat() throws Exception {
rule.setSearchTransitive(false);
Expand Down