fix: fixes the version number discrepancy between manifest file and h…

…tml report Signed-off-by: Olga Lavtar <olavtar@redhat.com>
RHEcosystemAppEng · Jun 14, 2024 · a3a265d · a3a265d
1 parent 711b039
commit a3a265d
Show file tree

Hide file tree

Showing 12 changed files with 2,841 additions and 644 deletions.
diff --git a/src/main/java/com/redhat/exhort/providers/GradleProvider.java b/src/main/java/com/redhat/exhort/providers/GradleProvider.java
@@ -253,7 +253,7 @@ private Sbom buildSbomFromTextFormat(
 
     for (String line : lines) {
       line = line.replaceAll("---", "-").replaceAll("    ", "  ");
-      line = line.replaceAll(":(.*):(.*) -> (.*)$", ":$1:$3");
+      line = line.replaceAll(":(.*):(.*) -> (.*)$", ":$1:$2");
       line = line.replaceAll("(.*):(.*):(.*)$", "$1:$2:jar:$3");
       line = line.replaceAll(" \\(n\\)$", "");
       line = line.replaceAll(" \\(\\*\\)", "");

diff --git a/src/test/resources/tst_manifests/gradle/deps_with_duplicate_different_versions/depTree.txt b/src/test/resources/tst_manifests/gradle/deps_with_duplicate_different_versions/depTree.txt
@@ -61,5 +61,5 @@ No dependencies
 
 A web-based, searchable dependency report is available by adding the --scan option.
 
-BUILD SUCCESSFUL in 375ms
+BUILD SUCCESSFUL in 424ms
 1 actionable task: 1 executed
diff --git a/...rces/tst_manifests/gradle/deps_with_duplicate_different_versions/expected_stack_sbom.json b/...rces/tst_manifests/gradle/deps_with_duplicate_different_versions/expected_stack_sbom.json
@@ -3,7 +3,7 @@
   "specVersion" : "1.4",
   "version" : 1,
   "metadata" : {
-    "timestamp" : "2024-05-01T22:57:54Z",
+    "timestamp" : "2024-06-14T20:49:04Z",
     "component" : {
       "group" : "org.acme.dbaas",
       "name" : "postgresql-orm-quarkus",
@@ -29,18 +29,31 @@
       "purl" : "pkg:maven/log4j/log4j@1.2.17",
       "type" : "library",
       "bom-ref" : "pkg:maven/log4j/log4j@1.2.17"
+    },
+    {
+      "group" : "log4j",
+      "name" : "log4j",
+      "version" : "1.2.14",
+      "purl" : "pkg:maven/log4j/log4j@1.2.14",
+      "type" : "library",
+      "bom-ref" : "pkg:maven/log4j/log4j@1.2.14"
     }
   ],
   "dependencies" : [
     {
       "ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT",
       "dependsOn" : [
-        "pkg:maven/log4j/log4j@1.2.17"
+        "pkg:maven/log4j/log4j@1.2.17",
+        "pkg:maven/log4j/log4j@1.2.14"
       ]
     },
     {
       "ref" : "pkg:maven/log4j/log4j@1.2.17",
       "dependsOn" : [ ]
+    },
+    {
+      "ref" : "pkg:maven/log4j/log4j@1.2.14",
+      "dependsOn" : [ ]
     }
   ]
 }
diff --git a/src/test/resources/tst_manifests/gradle/deps_with_duplicate_no_version/depTree.txt b/src/test/resources/tst_manifests/gradle/deps_with_duplicate_no_version/depTree.txt
@@ -10,7 +10,7 @@ No dependencies
 
 compileClasspath - Compile classpath for source set 'main'.
 +--- log4j:log4j:1.2.17
-\--- log4j:log4j:1.2.14 -> 1.2.17
+\--- log4j:log4j -> 1.2.17
 
 compileOnly - Compile-only dependencies for the 'main' feature. (n)
 No dependencies
@@ -20,14 +20,14 @@ No dependencies
 
 implementation - Implementation dependencies for the 'main' feature. (n)
 +--- log4j:log4j:1.2.17 (n)
-\--- log4j:log4j:1.2.14 (n)
+\--- log4j:log4j (n)
 
 mainSourceElements - List of source directories contained in the Main SourceSet. (n)
 No dependencies
 
 runtimeClasspath - Runtime classpath of source set 'main'.
 +--- log4j:log4j:1.2.17
-\--- log4j:log4j:1.2.14 -> 1.2.17
+\--- log4j:log4j -> 1.2.17
 
 runtimeElements - Runtime elements for the 'main' feature. (n)
 No dependencies
@@ -40,7 +40,7 @@ No dependencies
 
 testCompileClasspath - Compile classpath for source set 'test'.
 +--- log4j:log4j:1.2.17
-\--- log4j:log4j:1.2.14 -> 1.2.17
+\--- log4j:log4j -> 1.2.17
 
 testCompileOnly - Compile only dependencies for source set 'test'. (n)
 No dependencies
@@ -50,7 +50,7 @@ No dependencies
 
 testRuntimeClasspath - Runtime classpath of source set 'test'.
 +--- log4j:log4j:1.2.17
-\--- log4j:log4j:1.2.14 -> 1.2.17
+\--- log4j:log4j -> 1.2.17
 
 testRuntimeOnly - Runtime only dependencies for source set 'test'. (n)
 No dependencies
@@ -61,5 +61,5 @@ No dependencies
 
 A web-based, searchable dependency report is available by adding the --scan option.
 
-BUILD SUCCESSFUL in 375ms
+BUILD SUCCESSFUL in 522ms
 1 actionable task: 1 executed
diff --git a/...st/resources/tst_manifests/gradle/deps_with_duplicate_no_version/expected_stack_sbom.json b/...st/resources/tst_manifests/gradle/deps_with_duplicate_no_version/expected_stack_sbom.json
@@ -3,7 +3,7 @@
   "specVersion" : "1.4",
   "version" : 1,
   "metadata" : {
-    "timestamp" : "2024-05-01T22:57:54Z",
+    "timestamp" : "2024-06-14T20:48:18Z",
     "component" : {
       "group" : "org.acme.dbaas",
       "name" : "postgresql-orm-quarkus",

diff --git a/src/test/resources/tst_manifests/gradle/deps_with_ignore_full_specification/depTree.txt b/src/test/resources/tst_manifests/gradle/deps_with_ignore_full_specification/depTree.txt
@@ -2586,5 +2586,5 @@ No dependencies
 
 A web-based, searchable dependency report is available by adding the --scan option.
 
-BUILD SUCCESSFUL in 714ms
+BUILD SUCCESSFUL in 588ms
 1 actionable task: 1 executed