Specify version for maven plugin

CycloneDX · Oct 13, 2020 · 4c41e3b · 4c41e3b
1 parent d89a15f
commit 4c41e3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -383,12 +383,12 @@ const createJavaBom = async (
       const f = pomFiles[i];
       const basePath = pathLib.dirname(f);
       console.log(
-        "Executing 'mvn org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom' in",
+        "Executing 'mvn org.cyclonedx:cyclonedx-maven-plugin:2.1.0:makeAggregateBom' in",
         basePath
       );
       result = spawnSync(
         MVN_CMD,
-        ["org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom"],
+        ["org.cyclonedx:cyclonedx-maven-plugin:2.1.0:makeAggregateBom"],
         { cwd: basePath }
       );
       if (result.status == 1 || result.error) {

diff --git a/utils.js b/utils.js
@@ -551,6 +551,10 @@ const getPyMetadata = async function (pkgList) {
   const cdepList = [];
   for (const p of pkgList) {
     try {
+      // Some packages support extra modules
+      if (p.name.includes("[")) {
+        p.name = p.name.split("[")[0];
+      }
       const res = await got.get(PYPI_URL + p.name + "/json", {
         responseType: "json",
       });