Merge branch 'main' into dependabot/maven/main/com.google.googlejavaf…

…ormat-google-java-format-1.23.0
IBM · Sep 19, 2024 · 8b13d07 · 8b13d07
2 parents ae650e5 + 48837a4
commit 8b13d07
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -14,7 +14,7 @@ on:
   pull_request:
     branches: [ "main" ]
   release:
-    types: [ "released" ]
+    types: [ "published" ]
   workflow_dispatch:
 
 env:

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -14,7 +14,7 @@ on:
   pull_request:
     branches: [ "main" ]
   release:
-    types: [ "released" ]
+    types: [ "published" ]
   workflow_dispatch:
 
 env:

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
     <jackson.version>2.17.2</jackson.version>
     <cyclonedx-maven-plugin.version>2.8.0</cyclonedx-maven-plugin.version>
 
-    <sonar.crypto.plugin.version>1.2.0</sonar.crypto.plugin.version>
+    <sonar.crypto.plugin.version>1.3.0</sonar.crypto.plugin.version>
     <sonar.plugin.api.version>9.17.0.587</sonar.plugin.api.version>
     <sonar.plugin.api.impl.version>10.4.1.88267</sonar.plugin.api.impl.version>
     <!-- language parser versions -->

diff --git a/src/main/java/com/ibm/resources/v1/ScannerResource.java b/src/main/java/com/ibm/resources/v1/ScannerResource.java
@@ -19,7 +19,6 @@
  */
 package com.ibm.resources.v1;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ibm.Utils;
@@ -266,7 +265,7 @@ private Optional<JsonNode> runScan(
                         .scan(iMessageDispatcher, clonedProject.cloneDir, scanRequest);
         try {
             return scanResult.toJson();
-        } catch (JsonProcessingException jpe) {
+        } catch (Exception jpe) {
             LOG.error("Cannot parse CBOM", jpe);
         }
         return Optional.empty();

diff --git a/src/main/java/com/ibm/scan/IScanner.java b/src/main/java/com/ibm/scan/IScanner.java
@@ -29,6 +29,7 @@
 import java.util.Optional;
 import javax.annotation.Nonnull;
 import org.cyclonedx.Version;
+import org.cyclonedx.exception.GeneratorException;
 import org.cyclonedx.generators.BomGeneratorFactory;
 import org.cyclonedx.generators.json.BomJsonGenerator;
 import org.cyclonedx.model.Bom;
@@ -84,7 +85,7 @@ public void setDuration(long duration) {
         }
 
         @Nonnull
-        public Optional<JsonNode> toJson() throws JsonProcessingException {
+        public Optional<JsonNode> toJson() throws JsonProcessingException, GeneratorException {
             final ObjectMapper mapper = new ObjectMapper();
             if (bom != null) {
                 final BomJsonGenerator bomGenerator =