From 64300e49c7f8aa0419ff9514e97c8799fa4d138f Mon Sep 17 00:00:00 2001
From: Jonathan Mendez <jonnathan.mendez@gmail.com>
Date: Tue, 28 Jul 2026 15:38:41 -0600
Subject: [PATCH] Fix cyclonedx configs with new version

---
 gradle/bom.gradle | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle/bom.gradle b/gradle/bom.gradle
index 135b84a62..f0fe19791 100644
--- a/gradle/bom.gradle
+++ b/gradle/bom.gradle
@@ -21,19 +21,19 @@
 
 apply plugin: 'org.cyclonedx.bom'
 
-cyclonedxBom {
+tasks.named('cyclonedxDirectBom') {
 	projectType = 'application'
-	schemaVersion = '1.4'
+	schemaVersion = 'VERSION_14'
 	includeBomSerialNumber = true
 	includeLicenseText = false
-	outputFormat = 'json'
-	outputName = 'bom'
-	destination = layout.buildDirectory.get().asFile
 	skipConfigs = ['testRuntimeClasspath']
+	// Keep output at build/bom.json for aggregate-boms.sh
+	jsonOutput = layout.buildDirectory.file('bom.json')
+	xmlOutput.unsetConvention()
 }
 
 tasks.register('bomGenerate') {
 	group = 'build'
 	description = 'Generates CycloneDX BOM'
-	dependsOn tasks.named('cyclonedxBom')
+	dependsOn tasks.named('cyclonedxDirectBom')
 }