Skip to content

Commit

Permalink
Merge pull request #458 from MediaMarktSaturn/dependabot/maven/org.cy…
Browse files Browse the repository at this point in the history
…clonedx-cyclonedx-core-java-9.0.0

build(deps): bump org.cyclonedx:cyclonedx-core-java from 8.0.3 to 9.0.0
  • Loading branch information
heubeck authored May 15, 2024
2 parents 04f741d + 83c1a72 commit 55aa535
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.10.0</quarkus.platform.version>
<quarkus.platform.version>3.10.1</quarkus.platform.version>

<quarkus-github-app.version>2.5.1</quarkus-github-app.version>

<cyclonedx-core-java.version>8.0.3</cyclonedx-core-java.version>
<cyclonedx-core-java.version>9.0.0</cyclonedx-core-java.version>
<jruby.jcodings.version>1.0.58</jruby.jcodings.version>
<jruby.joni.version>2.2.1</jruby.joni.version>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
import io.vertx.mutiny.core.Vertx;
import io.vertx.mutiny.ext.web.client.WebClient;
import jakarta.enterprise.context.ApplicationScoped;
import org.cyclonedx.generators.json.BomJsonGenerator15;
import org.cyclonedx.Version;
import org.cyclonedx.generators.json.BomJsonGenerator;
import org.cyclonedx.model.Bom;
import org.cyclonedx.model.ExternalReference;
import org.eclipse.microprofile.config.inject.ConfigProperty;
Expand Down Expand Up @@ -49,7 +50,7 @@ public DependencyTrackClient(
*/
public Uni<Result<Project>> uploadSBOM(RepositoryDetails repoDetails, Bom sbom, String projectName, Project parentProject, Optional<String> commitSha) {
var projectVersion = repoDetails.version();
var sbomBase64 = Base64.getEncoder().encodeToString(new BomJsonGenerator15(sbom).toJsonString().getBytes(StandardCharsets.UTF_8));
var sbomBase64 = Base64.getEncoder().encodeToString(new BomJsonGenerator(sbom, Version.VERSION_15).toJsonString().getBytes(StandardCharsets.UTF_8));
var payload = new JsonObject(Map.of(
"projectName", projectName,
"projectVersion", projectVersion,
Expand Down

0 comments on commit 55aa535

Please sign in to comment.