NMS-16637: Added more dependencies

OpenNMS · Dec 10, 2024 · b60dc1f · b60dc1f
1 parent 9bfcb00
commit b60dc1f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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>