Update cyclonedx-maven-plugin to 2.9.1 and catch all exceptions for SBOMGenerator.generateIfSupportedAndEnabled

Author: rudsberg

native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy

@@ -104,7 +104,7 @@ class JavaApplicationFunctionalTest extends AbstractGraalVMMavenFunctionalTest {
         withSample("java-application-with-custom-packaging")
 
         when:
-        mvnDebug '-DquickBuild', 'package', '-Dpackaging=native-image', 'exec:exec@native'
+        mvn '-DquickBuild', 'package', '-Dpackaging=native-image', 'exec:exec@native'
 
         then:
         buildSucceeded

native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/SBOMFunctionalTest.groovy

@@ -97,7 +97,7 @@ class SBOMFunctionalTest extends AbstractGraalVMMavenFunctionalTest {
         outputContains "Hello, native!"
     }
 
-    def deleteTargetDir() {
+    private def deleteTargetDir() {
         file("target").deleteDir()
     }
 

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/NativeCompileNoForkMojo.java

@@ -128,11 +128,11 @@ private void generateBaseSBOMIfNeeded() throws MojoExecutionException {
             return;
         }
 
-        var sbomGenerator = new SBOMGenerator(mavenProject, mavenSession, pluginManager, repositorySystem, mainClass, logger);
+        var sbomGenerator = new SBOMGenerator(mavenProject, mavenSession, pluginManager, repositorySystem, mainClass);
         var config = new SBOMGenerator.Config(isOracleGraalVM(logger), getBuildArgs(), NativeImageUtils.getMajorJDKVersion(getVersionInformation(logger)));
         try {
             sbomGenerator.generateIfSupportedAndEnabled(config);
-        } catch (MojoExecutionException e) {
+        } catch (Exception e) {
             logger.warn(String.format("Could not generate base SBOM: %s. Fallback to generating an SBOM without knowledge from 'native-build-tools'.",
                     e.getCause().getMessage()));
         }

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/sbom/SBOMGenerator.java

@@ -46,7 +46,6 @@
 import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
 import org.eclipse.aether.RepositorySystem;
 
 import java.io.IOException;
@@ -104,7 +103,6 @@ public final class SBOMGenerator {
     private final BuildPluginManager pluginManager;
     private final RepositorySystem repositorySystem;
     private final String mainClass;
-    private final Logger logger;
 
     private static final String SBOM_NATIVE_IMAGE_FLAG = "--enable-sbom";
     private static final String SBOM_FILE_FORMAT = "json";
@@ -135,7 +133,7 @@ private static final class AddedComponentFields {
     private static final class Plugin {
         static final String artifactId = "cyclonedx-maven-plugin";
         static final String groupId = "org.cyclonedx";
-        static final String version = "2.8.1";
+        static final String version = "2.9.1";
         static final String goal = "makeAggregateBom";
 
         private static final class Configuration {
@@ -151,14 +149,12 @@ public SBOMGenerator(
             MavenSession mavenSession,
             BuildPluginManager pluginManager,
             RepositorySystem repositorySystem,
-            String mainClass,
-            Logger logger) {
+            String mainClass) {
         this.mavenProject = mavenProject;
         this.mavenSession = mavenSession;
         this.pluginManager = pluginManager;
         this.repositorySystem = repositorySystem;
         this.mainClass = mainClass;
-        this.logger = logger;
         this.outputDirectory = mavenProject.getBuild().getDirectory();
     }
 
@@ -185,9 +181,6 @@ public void generateIfSupportedAndEnabled(Config config) throws MojoExecutionExc
 
         Path sbomPath = Paths.get(outputDirectory, SBOM_FILENAME);
         try {
-            /* Suppress the output from the plugin. */
-            int loggingLevel = logger.getThreshold();
-            logger.setThreshold(Logger.LEVEL_DISABLED);
             executeMojo(
                     plugin(
                             groupId(Plugin.groupId),
@@ -204,7 +197,6 @@ public void generateIfSupportedAndEnabled(Config config) throws MojoExecutionExc
                     ),
                     executionEnvironment(mavenProject, mavenSession, pluginManager)
             );
-            logger.setThreshold(loggingLevel);
 
             if (!Files.exists(sbomPath)) {
                 return;