Specify atom java home

Signed-off-by: Prabhu Subramanian <[email protected]>
CycloneDX · Jan 2, 2025 · 2a2f6e9 · 2a2f6e9
1 parent 10dd751
commit 2a2f6e9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/snapshot-tests.yml b/.github/workflows/snapshot-tests.yml
@@ -44,7 +44,8 @@ jobs:
         run: |
           source .venv/bin/activate
           python test/diff/generate.py
-
+        env:
+          ATOM_JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
       - name: Upload shell scripts generated as artifact
         uses: actions/upload-artifact@v4
         with:

diff --git a/lib/cli/index.js b/lib/cli/index.js
@@ -3058,6 +3058,15 @@ export async function createPythonBom(path, options) {
         pkgList = pkgList.concat(retMap.pkgList);
         pkgList = trimComponents(pkgList);
       }
+      // Retain the parent hierarchy
+      if (retMap?.parentComponent?.components?.length) {
+        if (!parentComponent.components) {
+          parentComponent.components = [];
+        }
+        parentComponent.components = parentComponent.components.concat(
+          retMap?.parentComponent?.components,
+        );
+      }
       if (retMap.dependenciesList?.length) {
         dependencies = mergeDependencies(
           dependencies,

diff --git a/lib/helpers/utils.js b/lib/helpers/utils.js
@@ -4671,6 +4671,7 @@ export async function parsePyLockData(lockData, lockFile, pyProjectFile) {
     });
   }
   return {
+    parentComponent,
     pkgList,
     rootList,
     dependenciesList,
@@ -11097,7 +11098,10 @@ export function executeAtom(src, args) {
   const env = {
     ...process.env,
   };
-
+  // Atom requires Java >= 21
+  if (process.env?.ATOM_JAVA_HOME) {
+    env.JAVA_HOME = process.env.ATOM_JAVA_HOME;
+  }
   if (isWin) {
     env.PATH = `${env.PATH || env.Path}${_delimiter}${join(
       dirNameStr,

diff --git a/types/lib/cli/index.d.ts.map b/types/lib/cli/index.d.ts.map
diff --git a/types/lib/helpers/utils.d.ts b/types/lib/helpers/utils.d.ts
@@ -402,9 +402,11 @@ export function parsePyProjectTomlFile(tomlFile: string): any;
 export function parsePyLockData(lockData: any, lockFile: string, pyProjectFile: string): Promise<{
     pkgList: any[];
     dependenciesList: any[];
+    parentComponent?: undefined;
     rootList?: undefined;
     workspaceWarningShown?: undefined;
 } | {
+    parentComponent: any;
     pkgList: any[];
     rootList: {
         name: any;

diff --git a/types/lib/helpers/utils.d.ts.map b/types/lib/helpers/utils.d.ts.map