Merge pull request #587 from MediaMarktSaturn/renovate/cyclonedx-cdxg…

…en-10.x chore(deps): update dependency @cyclonedx/cdxgen to v10.10.7
MediaMarktSaturn · Oct 23, 2024 · b9059a3 · b9059a3
2 parents 93d207c + def0649
commit b9059a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
-  CDXGEN_VERSION: '10.10.6'
+  CDXGEN_VERSION: '10.10.7'
   CDXGEN_PLUGINS_VERSION: '1.6.3'
   GRYPE_VERSION: 'v0.82.2'
   SBOMQS_VERSION: 'v0.2.0'

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -17,6 +17,7 @@ ARG JAVA_23_VERSION='23-tem'
 ARG GRADLE_VERSION='8.10.1'
 ARG NODE_VERSION='21'
 ARG GO_VERSION='1.23.1'
+ARG MAVEN_VERSION='3.9.9'
 
 # location of application binaries and configuration
 ENV APP_DIR='/app'
@@ -117,7 +118,7 @@ RUN source "/root/.sdkman/bin/sdkman-init.sh" && \
     sdk install java $JAVA_17_VERSION && \
     sdk install java $JAVA_23_VERSION && \
     sdk install java $JAVA_21_VERSION && \
-    sdk install maven && \
+    sdk install maven $MAVEN_VERSION && \
     sdk install gradle $GRADLE_VERSION && \
     sdk install sbt && \
     mv /root/.sdkman/candidates $SDK_DIR && \