From 501cb8243e76e70535f46f2d43d9635f89af5271 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 30 Sep 2024 23:35:45 +0200
Subject: [PATCH] OZG-4833 add sbom to jar file

---
 ozgcloud-common-parent/pom.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ozgcloud-common-parent/pom.xml b/ozgcloud-common-parent/pom.xml
index a99e111..7e7d94e 100644
--- a/ozgcloud-common-parent/pom.xml
+++ b/ozgcloud-common-parent/pom.xml
@@ -67,7 +67,6 @@
 		<git-commit-id-maven-plugin.version>7.0.0</git-commit-id-maven-plugin.version>
 
 		<dependency-track-maven-plugin.version>1.7.0</dependency-track-maven-plugin.version>
-		<cyclonedx-maven-plugin.version>2.8.1</cyclonedx-maven-plugin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -363,12 +362,12 @@
 			<plugin>
 				<groupId>org.cyclonedx</groupId>
 				<artifactId>cyclonedx-maven-plugin</artifactId>
-				<version>${cyclonedx-maven-plugin.version}</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
 						<goals>
 							<goal>makeAggregateBom</goal>
+							<goal>makeBom</goal>
 						</goals>
 					</execution>
 				</executions>
@@ -390,11 +389,11 @@
 
 		<resources>
 			<resource>
-			<directory>${project.build.directory}</directory>
-			<includes>
-				<include>bom.xml</include>
-			</includes>
-			<targetPath>META-INF</targetPath>
+				<directory>${project.build.outputDirectory}/META-INF/sbom</directory>
+				<includes>
+					<include>application.cdx.json</include>
+				</includes>
+				<targetPath>META-INF/sbom</targetPath>
 			</resource>
 		</resources>
 	</build>
-- 
GitLab