From e2aa9d929779c6d8a04c65ebbd8077822ace6986 Mon Sep 17 00:00:00 2001
From: Robert Auer <robert.auer@cloudogu.com>
Date: Tue, 7 Jan 2025 14:36:35 +0100
Subject: [PATCH 1/2] Fix archive trivy scan files command

---
 CHANGELOG.md                                  | 2 ++
 src/com/cloudogu/ces/cesbuildlib/Trivy.groovy | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4647d8..6a48b87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 ## [Unreleased]
+### 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
diff --git a/src/com/cloudogu/ces/cesbuildlib/Trivy.groovy b/src/com/cloudogu/ces/cesbuildlib/Trivy.groovy
index 3e52fed..71d98c2 100644
--- 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) {

From 83c9659196a6c2bd1d5dfcfc017ca9ba92d2ee23 Mon Sep 17 00:00:00 2001
From: Robert Auer <robert.auer@cloudogu.com>
Date: Tue, 7 Jan 2025 14:45:01 +0100
Subject: [PATCH 2/2] Bump version

---
 CHANGELOG.md | 2 ++
 pom.xml      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a48b87..8f7346f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ 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
 
diff --git a/pom.xml b/pom.xml
index e3216d8..a76b556 100644
--- 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>