From c9281612749ee11b9fa4ad42fc08b2f8e616396d Mon Sep 17 00:00:00 2001
From: Ruben Romero Montes <rromerom@redhat.com>
Date: Wed, 26 Jun 2024 09:38:41 +0200
Subject: [PATCH] chore: upgrade recommended versions (#361)

Signed-off-by: Ruben Romero Montes <rromerom@redhat.com>
---
 pom.xml                                                       | 2 +-
 src/main/docker/Dockerfile.jvm                                | 2 +-
 src/main/docker/Dockerfile.jvm.staged                         | 4 ++--
 .../integration/backend/sbom/cyclonedx/CycloneDxParser.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7c4dc713..067b8c99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
     <!-- Dependencies -->
     <exhort-api.version>1.0.5</exhort-api.version>
     <sentry.version>7.8.0</sentry.version>
-    <cyclonedx.version>8.0.3</cyclonedx.version>
+    <cyclonedx.version>9.0.4</cyclonedx.version>
     <spdx.version>1.1.9.1</spdx.version>
     <htmlunit.version>2.70.0</htmlunit.version>
     <wiremock.version>3.4.2</wiremock.version>
diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
index 44c1cc55..1d833ebe 100644
--- a/src/main/docker/Dockerfile.jvm
+++ b/src/main/docker/Dockerfile.jvm
@@ -75,7 +75,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.redhat.io/ubi9/openjdk-21:1.18
+FROM registry.redhat.io/ubi9/openjdk-21:1.20
 
 ENV LANGUAGE='en_US:en'
 
diff --git a/src/main/docker/Dockerfile.jvm.staged b/src/main/docker/Dockerfile.jvm.staged
index 763d8783..0ca61bd8 100644
--- a/src/main/docker/Dockerfile.jvm.staged
+++ b/src/main/docker/Dockerfile.jvm.staged
@@ -17,7 +17,7 @@
 # docker run -i --rm -p 8080:8080 -p 9000:9000 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/code-with-quarkus-jvm
 #
 ###
-FROM registry.redhat.io/ubi9/openjdk-21:1.18
+FROM registry.redhat.io/ubi9/openjdk-21:1.20
 
 USER root
 WORKDIR /build
@@ -50,7 +50,7 @@ RUN if [ ! -d /build/target/quarkus-app ] ; then mkdir -p /build/target/quarkus-
      mv /build/target/$(cat .env-id)-$(cat .env-version)*.jar /build/target/quarkus-app/ ; \
      fi
 
-FROM registry.redhat.io/ubi9/openjdk-21-runtime:1.18
+FROM registry.redhat.io/ubi9/openjdk-21-runtime:1.20
 # Configure the JAVA_OPTS, you can add -XshowSettings:vm to also display the heap size.
 ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 # We make four distinct layers so if there are application changes the library layers can be re-used
diff --git a/src/main/java/com/redhat/exhort/integration/backend/sbom/cyclonedx/CycloneDxParser.java b/src/main/java/com/redhat/exhort/integration/backend/sbom/cyclonedx/CycloneDxParser.java
index 8576c987..9b7311ad 100644
--- a/src/main/java/com/redhat/exhort/integration/backend/sbom/cyclonedx/CycloneDxParser.java
+++ b/src/main/java/com/redhat/exhort/integration/backend/sbom/cyclonedx/CycloneDxParser.java
@@ -30,7 +30,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import org.cyclonedx.CycloneDxSchema.Version;
+import org.cyclonedx.Version;
 import org.cyclonedx.exception.ParseException;
 import org.cyclonedx.model.Bom;
 import org.cyclonedx.model.Component;