Guard for support SBOM version

rudsberg · rudsberg · commit b25c71dca469 · 2024-10-10T16:53:09.000+02:00
diff --git a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/SBOMFunctionalTest.groovy b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/SBOMFunctionalTest.groovy
@@ -68,7 +68,7 @@ class SBOMFunctionalTest extends AbstractGraalVMMavenFunctionalTest {
         EE() && jdkVersionSupportsAugmentedSBOM()
     }
 
-    @Requires({ EE() })
+    @Requires({ supportedAugmentedSBOMVersion() })
     def "sbom is created when buildArg '--enable-sbom=export,embed' is used"() {
         withSample 'java-application'
 
diff --git a/samples/java-application/pom.xml b/samples/java-application/pom.xml
@@ -116,7 +116,7 @@
                             <imageName>${imageName}</imageName>
                             <fallback>false</fallback>
                             <buildArgs>
-                                <buildArg>--enable-sbom</buildArg>
+                                <buildArg>--enable-sbom=embed,export</buildArg>
                             </buildArgs>
                         </configuration>
                     </plugin>

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class SBOMFunctionalTest extends AbstractGraalVMMavenFunctionalTest {`
`68`	`68`	`EE() && jdkVersionSupportsAugmentedSBOM()`
`69`	`69`	`}`
`70`	`70`
`71`		`- @Requires({ EE() })`
	`71`	`+ @Requires({ supportedAugmentedSBOMVersion() })`
`72`	`72`	`def "sbom is created when buildArg '--enable-sbom=export,embed' is used"() {`
`73`	`73`	`withSample 'java-application'`
`74`	`74`