diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index a7c396688..785af47a9 100644 --- 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 index 90a1657e5..afc10d2a2 100644 --- 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 index d7a1ead88..e4c425f92 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 2.17.2 2.8.0 - 1.2.0 + 1.3.0 9.17.0.587 10.4.1.88267 diff --git a/src/main/java/com/ibm/resources/v1/ScannerResource.java b/src/main/java/com/ibm/resources/v1/ScannerResource.java index 209b01a53..d0722b711 100644 --- 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 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 index d0c4d89f3..a4db068f4 100644 --- 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 toJson() throws JsonProcessingException { + public Optional toJson() throws JsonProcessingException, GeneratorException { final ObjectMapper mapper = new ObjectMapper(); if (bom != null) { final BomJsonGenerator bomGenerator =