From 084475228673172f733f21f1a1038dc676dfff67 Mon Sep 17 00:00:00 2001
From: bigbang bot <bigbang@p1.dso.mil>
Date: Sat, 9 Mar 2024 08:28:46 +0000
Subject: [PATCH 1/3] Update confluence_sbom.json

---
 confluence_sbom.json | 100 +++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/confluence_sbom.json b/confluence_sbom.json
index ac0de60..9a49a6a 100644
--- a/confluence_sbom.json
+++ b/confluence_sbom.json
@@ -1,7 +1,7 @@
 {
   "bomFormat": "CycloneDX",
   "specVersion": "1.5",
-  "serialNumber": "urn:uuid:a0d9d192-38c1-4bf2-8f4c-770f69d4f645",
+  "serialNumber": "urn:uuid:834ef5b2-b423-486d-9095-556e14534df7",
   "version": 1,
   "metadata": {
     "tools": null,
@@ -131791,12 +131791,31 @@
         },
         {
           "type": "library",
-          "bom-ref": "registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node@8.8.0:pkg:maven/com.sun.xml.ws/jaxws-rt@2.3.5?package-id=1c17752bf995dd33",
+          "bom-ref": "registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node@8.8.0:pkg:maven/com.sun.xml.ws/jaxws-rt@2.3.5?package-id=3b950747d1c6c9eb",
           "group": "com.sun.xml.ws",
           "name": "jaxws-rt",
           "version": "2.3.5",
-          "cpe": "cpe:2.3:a:jaxws-rt:jaxws-rt:2.3.5:*:*:*:*:*:*:*",
+          "licenses": [
+            {
+              "license": {
+                "name": "http://www.eclipse.org/org/documents/edl-v10.php"
+              }
+            }
+          ],
+          "cpe": "cpe:2.3:a:eclipse-foundation:jaxws-rt:2.3.5:*:*:*:*:*:*:*",
           "purl": "pkg:maven/com.sun.xml.ws/jaxws-rt@2.3.5",
+          "externalReferences": [
+            {
+              "url": "",
+              "type": "build-meta",
+              "hashes": [
+                {
+                  "alg": "SHA-1",
+                  "content": "1ff236e65aa1adbbd4a905eb6024fb941a875816"
+                }
+              ]
+            }
+          ],
           "properties": [
             {
               "name": "syft:package:foundBy",
@@ -131814,6 +131833,22 @@
               "name": "syft:package:metadataType",
               "value": "java-archive"
             },
+            {
+              "name": "syft:cpe23",
+              "value": "cpe:2.3:a:eclipse-foundation:jaxws_rt:2.3.5:*:*:*:*:*:*:*"
+            },
+            {
+              "name": "syft:cpe23",
+              "value": "cpe:2.3:a:eclipse_foundation:jaxws-rt:2.3.5:*:*:*:*:*:*:*"
+            },
+            {
+              "name": "syft:cpe23",
+              "value": "cpe:2.3:a:eclipse_foundation:jaxws_rt:2.3.5:*:*:*:*:*:*:*"
+            },
+            {
+              "name": "syft:cpe23",
+              "value": "cpe:2.3:a:jaxws-rt:jaxws-rt:2.3.5:*:*:*:*:*:*:*"
+            },
             {
               "name": "syft:cpe23",
               "value": "cpe:2.3:a:jaxws-rt:jaxws_rt:2.3.5:*:*:*:*:*:*:*"
@@ -131826,6 +131861,14 @@
               "name": "syft:cpe23",
               "value": "cpe:2.3:a:jaxws_rt:jaxws_rt:2.3.5:*:*:*:*:*:*:*"
             },
+            {
+              "name": "syft:cpe23",
+              "value": "cpe:2.3:a:eclipse:jaxws-rt:2.3.5:*:*:*:*:*:*:*"
+            },
+            {
+              "name": "syft:cpe23",
+              "value": "cpe:2.3:a:eclipse:jaxws_rt:2.3.5:*:*:*:*:*:*:*"
+            },
             {
               "name": "syft:cpe23",
               "value": "cpe:2.3:a:jaxws:jaxws-rt:2.3.5:*:*:*:*:*:*:*"
@@ -131876,7 +131919,7 @@
             },
             {
               "name": "syft:metadata:virtualPath",
-              "value": "/opt/atlassian/confluence/confluence/WEB-INF/lib/com.sun.xml.ws_jaxws-rt-2.3.5.jar:com.sun.xml.ws:jaxws-rt"
+              "value": "/opt/atlassian/confluence/confluence/WEB-INF/lib/com.sun.xml.ws_jaxws-rt-2.3.5.jar"
             }
           ]
         },
@@ -187846,31 +187889,12 @@
         },
         {
           "type": "library",
-          "bom-ref": "registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node@8.8.0:pkg:maven/com.sun.xml.ws/rt@2.3.5?package-id=daafc447baeeb48e",
+          "bom-ref": "registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node@8.8.0:pkg:maven/com.sun.xml.ws/rt@2.3.5?package-id=c13c3dbf35da6de0",
           "group": "com.sun.xml.ws",
           "name": "rt",
           "version": "2.3.5",
-          "licenses": [
-            {
-              "license": {
-                "name": "http://www.eclipse.org/org/documents/edl-v10.php"
-              }
-            }
-          ],
-          "cpe": "cpe:2.3:a:eclipse-foundation:rt:2.3.5:*:*:*:*:*:*:*",
+          "cpe": "cpe:2.3:a:sun:rt:2.3.5:*:*:*:*:*:*:*",
           "purl": "pkg:maven/com.sun.xml.ws/rt@2.3.5",
-          "externalReferences": [
-            {
-              "url": "",
-              "type": "build-meta",
-              "hashes": [
-                {
-                  "alg": "SHA-1",
-                  "content": "1ff236e65aa1adbbd4a905eb6024fb941a875816"
-                }
-              ]
-            }
-          ],
           "properties": [
             {
               "name": "syft:package:foundBy",
@@ -187888,30 +187912,6 @@
               "name": "syft:package:metadataType",
               "value": "java-archive"
             },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:eclipse_foundation:rt:2.3.5:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:jaxws-rt:rt:2.3.5:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:jaxws_rt:rt:2.3.5:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:eclipse:rt:2.3.5:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:jaxws:rt:2.3.5:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:sun:rt:2.3.5:*:*:*:*:*:*:*"
-            },
             {
               "name": "syft:cpe23",
               "value": "cpe:2.3:a:xml:rt:2.3.5:*:*:*:*:*:*:*"
@@ -187942,7 +187942,7 @@
             },
             {
               "name": "syft:metadata:virtualPath",
-              "value": "/opt/atlassian/confluence/confluence/WEB-INF/lib/com.sun.xml.ws_jaxws-rt-2.3.5.jar"
+              "value": "/opt/atlassian/confluence/confluence/WEB-INF/lib/com.sun.xml.ws_jaxws-rt-2.3.5.jar:com.sun.xml.ws:rt"
             }
           ]
         },
-- 
GitLab


From eb41ebfae77a88c77fb5dd50c4a4ada8d32fcd8b Mon Sep 17 00:00:00 2001
From: bigbang bot <bigbang@p1.dso.mil>
Date: Mon, 11 Mar 2024 07:28:12 +0000
Subject: [PATCH 2/3] Update confluence_sbom.json

---
 confluence_sbom.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/confluence_sbom.json b/confluence_sbom.json
index 9a49a6a..dabe05f 100644
--- a/confluence_sbom.json
+++ b/confluence_sbom.json
@@ -1,7 +1,7 @@
 {
   "bomFormat": "CycloneDX",
   "specVersion": "1.5",
-  "serialNumber": "urn:uuid:834ef5b2-b423-486d-9095-556e14534df7",
+  "serialNumber": "urn:uuid:cdbda796-5550-4a07-b22e-fc6c26d435f5",
   "version": 1,
   "metadata": {
     "tools": null,
-- 
GitLab


From 3a53972cfe932f82eee61645ed7608f33cce1d4c Mon Sep 17 00:00:00 2001
From: bigbang bot <bigbang@p1.dso.mil>
Date: Tue, 12 Mar 2024 07:28:59 +0000
Subject: [PATCH 3/3] Update confluence_sbom.json

---
 confluence_sbom.json | 90 ++++++++++++--------------------------------
 1 file changed, 25 insertions(+), 65 deletions(-)

diff --git a/confluence_sbom.json b/confluence_sbom.json
index dabe05f..ebd40a4 100644
--- a/confluence_sbom.json
+++ b/confluence_sbom.json
@@ -1,7 +1,7 @@
 {
   "bomFormat": "CycloneDX",
   "specVersion": "1.5",
-  "serialNumber": "urn:uuid:cdbda796-5550-4a07-b22e-fc6c26d435f5",
+  "serialNumber": "urn:uuid:bb9a9eb9-ca23-4bb0-b2b5-69c5e63f56e0",
   "version": 1,
   "metadata": {
     "tools": null,
@@ -88795,12 +88795,31 @@
         },
         {
           "type": "library",
-          "bom-ref": "registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node@8.8.0:pkg:maven/com.atlassian.zdu/confluence-zdu-plugin@2.0.4?package-id=bff847c44fe277a4",
+          "bom-ref": "registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node@8.8.0:pkg:maven/com.atlassian.zdu/confluence-zdu-plugin@2.0.4?package-id=3ad3c002a7d43d21",
           "group": "com.atlassian.zdu",
           "name": "confluence-zdu-plugin",
           "version": "2.0.4",
+          "licenses": [
+            {
+              "license": {
+                "name": "https://www.atlassian.com/legal/customer-agreement"
+              }
+            }
+          ],
           "cpe": "cpe:2.3:a:confluence-zdu-plugin:confluence-zdu-plugin:2.0.4:*:*:*:*:*:*:*",
           "purl": "pkg:maven/com.atlassian.zdu/confluence-zdu-plugin@2.0.4",
+          "externalReferences": [
+            {
+              "url": "",
+              "type": "build-meta",
+              "hashes": [
+                {
+                  "alg": "SHA-1",
+                  "content": "a303d01f2533e838c1a3a6ba377754c96cdade0c"
+                }
+              ]
+            }
+          ],
           "properties": [
             {
               "name": "syft:package:foundBy",
@@ -88888,7 +88907,7 @@
             },
             {
               "name": "syft:metadata:virtualPath",
-              "value": "/opt/atlassian/confluence/confluence/WEB-INF/atlassian-bundled-plugins/com.atlassian.zdu.confluence-zdu-plugin-2.0.4.jar:com.atlassian.zdu:confluence-zdu-plugin"
+              "value": "/opt/atlassian/confluence/confluence/WEB-INF/atlassian-bundled-plugins/com.atlassian.zdu.confluence-zdu-plugin-2.0.4.jar"
             }
           ]
         },
@@ -215105,31 +215124,12 @@
         },
         {
           "type": "library",
-          "bom-ref": "registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node@8.8.0:pkg:maven/com.atlassian.zdu/zdu-plugin@2.0.4?package-id=b3e753de2a2319b4",
+          "bom-ref": "registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node@8.8.0:pkg:maven/com.atlassian.zdu/zdu-plugin@2.0.4?package-id=31d77074960d85b7",
           "group": "com.atlassian.zdu",
           "name": "zdu-plugin",
           "version": "2.0.4",
-          "licenses": [
-            {
-              "license": {
-                "name": "https://www.atlassian.com/legal/customer-agreement"
-              }
-            }
-          ],
-          "cpe": "cpe:2.3:a:confluence-zdu-plugin:zdu-plugin:2.0.4:*:*:*:*:*:*:*",
+          "cpe": "cpe:2.3:a:zdu-plugin:zdu-plugin:2.0.4:*:*:*:*:*:*:*",
           "purl": "pkg:maven/com.atlassian.zdu/zdu-plugin@2.0.4",
-          "externalReferences": [
-            {
-              "url": "",
-              "type": "build-meta",
-              "hashes": [
-                {
-                  "alg": "SHA-1",
-                  "content": "a303d01f2533e838c1a3a6ba377754c96cdade0c"
-                }
-              ]
-            }
-          ],
           "properties": [
             {
               "name": "syft:package:foundBy",
@@ -215147,46 +215147,6 @@
               "name": "syft:package:metadataType",
               "value": "java-archive"
             },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:confluence-zdu-plugin:zdu_plugin:2.0.4:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:confluence_zdu_plugin:zdu-plugin:2.0.4:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:confluence_zdu_plugin:zdu_plugin:2.0.4:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:confluence-zdu:zdu-plugin:2.0.4:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:confluence-zdu:zdu_plugin:2.0.4:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:confluence_zdu:zdu-plugin:2.0.4:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:confluence_zdu:zdu_plugin:2.0.4:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:confluence:zdu-plugin:2.0.4:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:confluence:zdu_plugin:2.0.4:*:*:*:*:*:*:*"
-            },
-            {
-              "name": "syft:cpe23",
-              "value": "cpe:2.3:a:zdu-plugin:zdu-plugin:2.0.4:*:*:*:*:*:*:*"
-            },
             {
               "name": "syft:cpe23",
               "value": "cpe:2.3:a:zdu-plugin:zdu_plugin:2.0.4:*:*:*:*:*:*:*"
@@ -215233,7 +215193,7 @@
             },
             {
               "name": "syft:metadata:virtualPath",
-              "value": "/opt/atlassian/confluence/confluence/WEB-INF/atlassian-bundled-plugins/com.atlassian.zdu.confluence-zdu-plugin-2.0.4.jar"
+              "value": "/opt/atlassian/confluence/confluence/WEB-INF/atlassian-bundled-plugins/com.atlassian.zdu.confluence-zdu-plugin-2.0.4.jar:com.atlassian.zdu:zdu-plugin"
             }
           ]
         },
-- 
GitLab