fix for issue #331

Signed-off-by: Kai Zhuo <kai.zhuo@stiwa.com>
CycloneDX · Apr 23, 2024 · e82547c · e82547c
1 parent 73b8228
commit e82547c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/org/cyclonedx/gradle/CycloneDxTask.java b/src/main/java/org/cyclonedx/gradle/CycloneDxTask.java
@@ -363,7 +363,7 @@ public void createBom() {
                 }
 
                 for (ResolvedDependency directModuleDependency : directModuleDependencies) {
-                    ResolvedArtifact directJarArtifact = getJarArtifact(directModuleDependency);
+                    ResolvedArtifact directJarArtifact = getJarOrZipArtifact(directModuleDependency);
                     if (directJarArtifact != null) {
                         moduleDependency.addDependency(new org.cyclonedx.model.Dependency(generatePackageUrl(directJarArtifact)));
                         buildDependencyGraph(dependencies, directModuleDependency, directJarArtifact);
@@ -412,7 +412,7 @@ private void addLocalProjectDependenciesToBuiltDependencies(Set<String> builtDep
     }
 
     private boolean dependencyWithoutJarArtifact(ResolvedDependency dependency) {
-        return getJarArtifact(dependency) == null;
+        return getJarOrZipArtifact(dependency) == null;
     }
 
     private CycloneDxSchema.Version computeSchemaVersion() {
@@ -433,7 +433,7 @@ private Map<String, org.cyclonedx.model.Dependency> buildDependencyGraph(Map<Str
         dependenciesSoFar.put(dependencyPurl, dependency);
 
         for (ResolvedDependency childDependency : resolvedDependency.getChildren()) {
-            ResolvedArtifact childJarArtifact = getJarArtifact(childDependency);
+            ResolvedArtifact childJarArtifact = getJarOrZipArtifact(childDependency);
             if (childJarArtifact != null) {
                 dependency.addDependency(new org.cyclonedx.model.Dependency(generatePackageUrl(childJarArtifact)));
                 buildDependencyGraph(dependenciesSoFar, childDependency, childJarArtifact);
@@ -442,9 +442,9 @@ private Map<String, org.cyclonedx.model.Dependency> buildDependencyGraph(Map<Str
         return dependenciesSoFar;
     }
 
-    private ResolvedArtifact getJarArtifact(ResolvedDependency dependency) {
+    private ResolvedArtifact getJarOrZipArtifact(ResolvedDependency dependency) {
         for(ResolvedArtifact artifact : dependency.getModuleArtifacts()) {
-            if (Objects.equals(artifact.getType(), "jar") || Objects.equals(artifact.getType(), "aar"))  {
+            if (Objects.equals(artifact.getType(), "jar") || Objects.equals(artifact.getType(), "aar") || Objects.equals(artifact.getType(), "zip"))  {
                 return artifact;
             }
         }