Skip to content

Commit 4989798

Browse files
authored
Merge branch 'master' into ane-2484-vendor-bins
2 parents 83709b6 + 9cf32d1 commit 4989798

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# FOSSA CLI Changelog
22

3+
## Unreleased
4+
5+
- gradle: Do not report version constraints, version contraints are contained within an`DependencyResult`, filter out any constraints by checking [`isConstraint()`](https://docs.gradle.org/current/javadoc/org/gradle/api/artifacts/result/DependencyResult.html#isConstraint()). ([#1563](https://github.com/fossas/fossa-cli/pull/1563))
6+
37
## 3.10.13
48

59
- Updates the `fossa test` output to include severity data on supported FOSSA instances ([#1562](https://github.com/fossas/fossa-cli/pull/1562))

scripts/jsondeps.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,11 @@ allprojects {
114114
printDebugToFossa("Could not resolve dependency: ${resolvedDep.getAttempted()}", "resolvedConfigToJSON")
115115
return
116116
}
117-
118117
def resolvedDependencyId = resolvedDep.getSelected().getId()
118+
if (resolvedDep.isConstraint()) {
119+
printDebugToFossa("Skipping constraint dependency: ${resolvedDependencyId}", "resolvedConfigToJSON")
120+
return
121+
}
119122
if (resolvedDependencyId != resolvedComponent.getId()) {
120123
adjacencyMap.get(resolvedComponent, []) << resolvedDependencyId
121124
}

0 commit comments

Comments
 (0)