This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/branch-4.15 by this push:
new 8f0b8e1f01 Fix owasp check failed (#4283)
8f0b8e1f01 is described below
commit 8f0b8e1f01a609d45ab9630204f6e487f71df14d
Author: Hang Chen <[email protected]>
AuthorDate: Thu Apr 11 19:46:24 2024 +0800
Fix owasp check failed (#4283)
### Motivation
Fix the OWASP check failed in branch-4.15
---
src/owasp-dependency-check-suppressions.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/owasp-dependency-check-suppressions.xml
b/src/owasp-dependency-check-suppressions.xml
index 101d1e52e5..f8a3109255 100644
--- a/src/owasp-dependency-check-suppressions.xml
+++ b/src/owasp-dependency-check-suppressions.xml
@@ -194,7 +194,6 @@
<sha1>9b78a289a3aa34eb47fac8c432f664fc140387df</sha1>
<cve>CVE-2021-28165</cve>
</suppress>
-<<<<<<< HEAD
<!-- Netty false positive
https://github.com/netty/netty-tcnative/issues/710 -->
<suppress>
<notes><