Skip to content

Commit c0427a8

Browse files
committed
fix: problem with gradle version resolution
Signed-off-by: Chao Wang <chaowan@redhat.com>
1 parent 1db5b9b commit c0427a8

39 files changed

Lines changed: 12747 additions & 6202 deletions

src/main/java/com/redhat/exhort/providers/BaseJavaProvider.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@
2525
import java.util.Map;
2626
import java.util.Objects;
2727
import java.util.TreeMap;
28+
import org.cyclonedx.model.Component;
2829

2930
public abstract class BaseJavaProvider extends Provider {
3031

3132
protected BaseJavaProvider(Ecosystem.Type ecosystem, Path manifest) {
3233
super(ecosystem, manifest);
3334
}
3435

35-
void parseDependencyTree(String src, int srcDepth, String[] lines, Sbom sbom) {
36+
void parseDependencyTree(
37+
String src, int srcDepth, String[] lines, Sbom sbom, Component.Scope scope) {
3638
if (lines.length == 0) {
3739
return;
3840
}
@@ -47,11 +49,12 @@ void parseDependencyTree(String src, int srcDepth, String[] lines, Sbom sbom) {
4749
PackageURL from = parseDep(src);
4850
PackageURL to = parseDep(target);
4951
if (dependencyIsNotTestScope(from) && dependencyIsNotTestScope(to)) {
50-
sbom.addDependency(from, to);
52+
sbom.addDependency(from, to, scope);
5153
}
5254
} else {
5355
String[] modifiedLines = Arrays.copyOfRange(lines, index, lines.length);
54-
parseDependencyTree(lines[index - 1], getDepth(lines[index - 1]), modifiedLines, sbom);
56+
parseDependencyTree(
57+
lines[index - 1], getDepth(lines[index - 1]), modifiedLines, sbom, scope);
5558
}
5659
if (index < lines.length - 1) {
5760
target = lines[++index];

src/main/java/com/redhat/exhort/providers/GoModulesProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private Sbom buildSbomFromGraph(
300300
dep -> {
301301
PackageURL targetPurl =
302302
toPurl((String) dep, "@", this.goEnvironmentVariableForPurl);
303-
sbom.addDependency(source, targetPurl);
303+
sbom.addDependency(source, targetPurl, null);
304304
});
305305
});
306306
List<String> ignoredDepsPurl =
@@ -433,7 +433,7 @@ private Sbom buildSbomFromList(String golangDeps, List<PackageURL> ignoredDeps)
433433
dep -> {
434434
PackageURL targetPurl = toPurl(dep, "@", this.goEnvironmentVariableForPurl);
435435
if (dependencyNotToBeIgnored(ignoredDeps, targetPurl)) {
436-
sbom.addDependency(root, targetPurl);
436+
sbom.addDependency(root, targetPurl, null);
437437
}
438438
});
439439
List<String> ignoredDepsByName = new ArrayList<>();

0 commit comments

Comments
 (0)