From f707fff623701c28160fb2e862f811042fee325b Mon Sep 17 00:00:00 2001
From: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
Date: Tue, 24 Sep 2024 08:00:49 +0200
Subject: [PATCH 1/3] Fix: remove unsupported option

Required-githooks: true

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
---
 utils/trivy/trivy.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/utils/trivy/trivy.yaml b/utils/trivy/trivy.yaml
index 293f7b1ba9f..2d3119efd37 100644
--- a/utils/trivy/trivy.yaml
+++ b/utils/trivy/trivy.yaml
@@ -1,6 +1,5 @@
 cache:
-  backend: fs
-  clear: false
+  backend: memory
   dir:
   redis:
     ca: ""

From d4a80df0385466b9a5007cc9862d824ea22848e2 Mon Sep 17 00:00:00 2001
From: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
Date: Tue, 24 Sep 2024 08:03:48 +0200
Subject: [PATCH 2/3] Limit scope of changes affected by Trivy scan

Required-githooks: true

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
---
 .github/workflows/trivy.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index a9eec6447fd..36e81275128 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -3,6 +3,11 @@ name: Trivy scan
 on:
   pull_request:
     branches: ["master", "release/**"]
+    path:
+      - '**/go.mod'
+      - '**/pom.xml'
+      - '**/requirements.txt'
+      - '**/*trivy*'
 
 # Declare default permissions as nothing.
 permissions: {}

From 7ddd7191c24e35da22e947eeb72046715f7772be Mon Sep 17 00:00:00 2001
From: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
Date: Tue, 24 Sep 2024 08:12:30 +0200
Subject: [PATCH 3/3] Test with non-trivy files

Required-githooks: true

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
---
 src/client/dfs/common.c                     | 1 -
 src/client/java/daos-java/find_java_home.sh | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/dfs/common.c b/src/client/dfs/common.c
index 04f2867065e..2df3247026b 100644
--- a/src/client/dfs/common.c
+++ b/src/client/dfs/common.c
@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
-
 #define D_LOGFAC DD_FAC(dfs)
 
 #include <daos/common.h>
diff --git a/src/client/java/daos-java/find_java_home.sh b/src/client/java/daos-java/find_java_home.sh
index a3fea51196b..bb81ad3f096 100755
--- a/src/client/java/daos-java/find_java_home.sh
+++ b/src/client/java/daos-java/find_java_home.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+
 java_home_path=$JAVA_HOME
 if [ -n  "$java_home_path" ]
 then