Resolve merge conflict

Author: wurstbrot

src/assets/YAML/default/implementations.yaml

@@ -786,7 +786,9 @@ implementations:
     tags: [pre-commit]
   dependencyTrack:
     uuid: 500399bd-7dfc-47fd-99d8-b55cefb760a9
-    name: Dependency-Track is an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Dependency-Track takes a unique and highly beneficial approach by leveraging the capabilities of Software Bill of Materials (SBOM).
+    name: Dependency-Track
+    description: |
+      Dependency-Track is an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Dependency-Track takes a unique and highly beneficial approach by leveraging the capabilities of Software Bill of Materials (SBOM).
     url: https://github.com/DependencyTrack/dependency-track
     tags: [sca, inventory, OpenSource, "Supply Chain", vulnerability, inventory]
   hashicorp-vault:

yaml-generation/generateDimensions.php

@@ -91,7 +91,7 @@
             }
             if (!array_key_exists("openCRE", $activity["references"])) {
                 $dimensionsAggregated[$dimension][$subdimension][$activityName]["references"]["openCRE"] = array();
-                $dimensionsAggregated[$dimension][$subdimension][$activityName]["references"]["openCRE"][] = "https://www.opencre.org/rest/v1/standard/DevSecOps+Maturity+Model+(DSOMM)/" . $subdimension . "/" . $dimensionsAggregated[$dimension][$subdimension][$activityName]["uuid"];
+                $dimensionsAggregated[$dimension][$subdimension][$activityName]["references"]["openCRE"][] = buildOpenCreUrl($dimension, $subdimension, $activityName);
             }
             if (array_key_exists("dependsOn", $activity)) {
                 foreach($activity['dependsOn'] as $index => $dependsOnName) {
@@ -240,7 +240,14 @@
 fclose($graphFile);
 echo "Saved dependency graph: '$graphFilename'\n\n";
 
-
+function buildOpenCreUrl($dimension, $subdimension, $activityName) {
+    $baseUrl = "https://www.opencre.org/node/standard/";
+    $DSOMM = "DevSecOps Maturity Model (DSOMM)";
+    $url = $baseUrl . rawurlencode($DSOMM) . 
+        "/section/" . rawurlencode($subdimension) .
+        "/subsection/" . rawurlencode($activityName);
+    return $url;
+}
 
 function assertUniqueRefs($all_references, &$errorMsg) {
     foreach ($all_references as $references) {