Merge branch 'release/4.0.1'

cloudogu · Jan 7, 2025 · 436f49f · 436f49f
2 parents 3f99b93 + 83c9659
commit 436f49f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.0.1](https://github.com/cloudogu/ces-build-lib/releases/tag/4.0.1) - 2025-01-07
+### Fixed
+- Archive Trivy scan artifacts correctly
+
 ## [4.0.0](https://github.com/cloudogu/ces-build-lib/releases/tag/4.0.0) - 2025-01-07
 ### Added
 - Add Trivy class for scanning container images with Trivy

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
     <groupId>com.cloudogu.ces</groupId>
     <artifactId>ces-build-lib</artifactId>
     <name>ces-build-lib</name>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
 
 
     <properties>

diff --git a/src/com/cloudogu/ces/cesbuildlib/Trivy.groovy b/src/com/cloudogu/ces/cesbuildlib/Trivy.groovy
@@ -153,7 +153,7 @@ class Trivy implements Serializable {
             .inside("-v ${script.env.WORKSPACE}/.trivy/.cache:/root/.cache/") {
                 script.sh(script: "trivy convert --format ${formatString} --severity ${severity} --output ${trivyDirectory}/${formattedTrivyReportFilename} ${trivyReportFile}")
             }
-        script.archiveArtifacts artifacts: "${trivyDirectory}/${formattedTrivyReportFilename}.*", allowEmptyArchive: true
+        script.archiveArtifacts artifacts: "${trivyDirectory}/*", allowEmptyArchive: true
     }
 
     private static String getFileExtension(String format) {