fix: Add dependencyManagement exclusions to the child exclusions

coheigea · coheigea · commit 81492e457cee · 2024-06-20T09:23:39.000+01:00
diff --git a/pkg/dependency/parser/java/pom/pom.go b/pkg/dependency/parser/java/pom/pom.go
@@ -266,8 +266,8 @@ func (d pomDependency) Resolve(props map[string]string, depManagement, rootDepMa
 		if !dep.Optional {
 			dep.Optional = managed.Optional
 		}
-		if len(dep.Exclusions.Exclusion) == 0 {
-			dep.Exclusions = managed.Exclusions
+		// `mvn` always merges exceptions for pom and parent
+		dep.Exclusions.Exclusion = append(dep.Exclusions.Exclusion, managed.Exclusions.Exclusion...)
 		}
 	}
 	return dep

Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,8 @@ func (d pomDependency) Resolve(props map[string]string, depManagement, rootDepMa`
`266`	`266`	`if !dep.Optional {`
`267`	`267`	`dep.Optional = managed.Optional`
`268`	`268`	`}`
`269`		`- if len(dep.Exclusions.Exclusion) == 0 {`
`270`		`- dep.Exclusions = managed.Exclusions`
	`269`	+ // `mvn` always merges exceptions for pom and parent
	`270`	`+ dep.Exclusions.Exclusion = append(dep.Exclusions.Exclusion, managed.Exclusions.Exclusion...)`
`271`	`271`	`}`
`272`	`272`	`}`
`273`	`273`	`return dep`