From 9f301c252a23568deacfb3b4bca2636e3f1d4d38 Mon Sep 17 00:00:00 2001
From: Martina Kraus <martina@dhis2.org>
Date: Wed, 18 Dec 2024 10:52:32 +0100
Subject: [PATCH] feat: integrate dependency track

---
 .github/workflows/generate-merge-boms.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/generate-merge-boms.yml b/.github/workflows/generate-merge-boms.yml
index 7186d5f5c699..7f7cc6d5e1dd 100644
--- a/.github/workflows/generate-merge-boms.yml
+++ b/.github/workflows/generate-merge-boms.yml
@@ -11,6 +11,8 @@ on:
       - master
       - "2.3[1-9]"
       - "2.4[0-9]"
+  workflow_dispatch:
+
 concurrency:
   group: ${{ github.workflow}}-${{ github.ref }}
   cancel-in-progress: true
@@ -19,6 +21,10 @@ jobs:
   create-boms:
     runs-on: ubuntu-latest
 
+    defaults:
+      run:
+        working-directory: dhis-2/
+
     steps:
       - uses: actions/checkout@v4
         with:
@@ -31,9 +37,6 @@ jobs:
           distribution: temurin
           cache: maven
 
-      - name: Install CycloneDX Maven Plugin
-        run: mvn install org.cyclonedx:cyclonedx-maven-plugin:2.7.4
-
       - name: Generate BOMs
         run: mvn cyclonedx:makeBom
 
@@ -45,7 +48,6 @@ jobs:
 
       - name: Merge BOMs
         run: cyclonedx merge --input-files $(find . -name 'dxbom.json') --input-format json --output-file target/merged-bom.json --output-format json
-
     #  - name: Upload merged BOM
     #    uses: actions/upload-artifact@v3
     #    with: