From b60dc1ff5915d114076644976a7e4ab2d012dc4e Mon Sep 17 00:00:00 2001
From: Christian Pape <Christian.Pape@informatik.hs-fulda.de>
Date: Mon, 9 Dec 2024 08:40:26 +0100
Subject: [PATCH] NMS-16637: Added more dependencies

---
 container/features/src/main/resources/features.xml | 7 +++++--
 pom.xml                                            | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml
index d2486dcf8086..390bdb13b233 100644
--- a/container/features/src/main/resources/features.xml
+++ b/container/features/src/main/resources/features.xml
@@ -188,10 +188,13 @@
     </feature>
     <feature name="owasp-html-sanitizer" version="${owaspHtmlSanitizerVersion}" description="OWASP :: HTML Sanitizer">
         <feature version="${guavaOsgiVersion}">guava</feature>
-        <bundle>mvn:com.google.code.findbugs/jsr305/3.0.2</bundle>
+        <!--
+        <bundle>mvn:com.google.code.findbugs/jsr305/${findbugsJsr305Version}</bundle>
+        <bundle>mvn:com.google.code.findbugs/annotations/${findbugsAnnotationsVersion}</bundle>
         <bundle>wrap:mvn:com.googlecode.owasp-java-html-sanitizer/java8-shim/${owaspHtmlSanitizerVersion}</bundle>
         <bundle>wrap:mvn:com.googlecode.owasp-java-html-sanitizer/java10-shim/${owaspHtmlSanitizerVersion}</bundle>
-        <bundle>mvn:com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer/${owaspHtmlSanitizerVersion}</bundle>
+        -->
+        <bundle>wrap:mvn:com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer/${owaspHtmlSanitizerVersion}$overwrite=merge&amp;Import-Package=javax.annotation;version=!,*</bundle>
     </feature>
     <feature name="postgresql" version="${postgresqlVersion}" description="PostgreSQL :: JDBC Driver">
         <feature>pax-jdbc-spec</feature>
diff --git a/pom.xml b/pom.xml
index f0919637961c..1b7a8ee36700 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1665,6 +1665,8 @@
     <esapiVersion>2.3.0.0</esapiVersion>
     <felixBridgeVersion>4.0.12</felixBridgeVersion>
     <felixProxyVersion>3.0.6</felixProxyVersion>
+    <findbugsJsr305Version>3.0.2</findbugsJsr305Version>
+    <findbugsAnnotationsVersion>3.0.1</findbugsAnnotationsVersion>
     <fopVersion>2.10</fopVersion>
     <freemarkerVersion>2.3.32</freemarkerVersion>
     <fstVersion>2.57</fstVersion>