Skip to content

Commit

Permalink
Merge pull request #2521 from Siemens-Healthineers/feat/cycloneDXVers…
Browse files Browse the repository at this point in the history
…ionUpdate

feat(CycloneDX): Update cyclonedx-core-java and jackson version

Reviewed-by: mishra.gaurav@siemens.com
Tested-by: akshit.joshi@siemens-healthineers.com
  • Loading branch information
GMishx committed Sep 20, 2024
2 parents cd3d823 + 66cac90 commit a140ee7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
import org.apache.logging.log4j.Logger;
import org.codehaus.plexus.util.CollectionUtils;
import org.cyclonedx.exception.GeneratorException;
import org.cyclonedx.generators.json.BomJsonGenerator14;
import org.cyclonedx.generators.xml.BomXmlGenerator14;
import org.cyclonedx.generators.json.BomJsonGenerator;
import org.cyclonedx.generators.xml.BomXmlGenerator;
import org.cyclonedx.Version;
import org.cyclonedx.model.Bom;
import org.cyclonedx.model.Component.Type;
import org.cyclonedx.model.ExternalReference;
Expand Down Expand Up @@ -135,10 +136,10 @@ public RequestSummary exportSbom(String projectId, String bomType, Boolean inclu
bom.setMetadata(metadata);

if (SW360Constants.JSON_FILE_EXTENSION.equalsIgnoreCase(bomType)) {
BomJsonGenerator14 jsonBom = new BomJsonGenerator14(bom);
BomJsonGenerator jsonBom = new BomJsonGenerator(bom, Version.VERSION_14);
summary.setMessage(jsonBom.toJsonString());
} else {
BomXmlGenerator14 xmlBom = new BomXmlGenerator14(bom);
BomXmlGenerator xmlBom = new BomXmlGenerator(bom, Version.VERSION_14);
summary.setMessage(xmlBom.toXmlString());
}
return summary;
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
<json-path.version>2.9.0</json-path.version>
<json-smart.version>2.4.10</json-smart.version>
<json-simple.version>4.0.1</json-simple.version>
<jackson.version>2.14.2</jackson.version>
<jackson.version>2.17.1</jackson.version>

<!-- Dependencies version properties -->
<byte-buddy.version>1.12.13</byte-buddy.version>
<cloudant.version>2.19.1</cloudant.version>
Expand Down Expand Up @@ -278,7 +279,7 @@
<dependency>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-core-java</artifactId>
<version>7.3.2</version>
<version>9.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down

0 comments on commit a140ee7

Please sign in to comment.