Merge remote-tracking branch 'origin/foundation-2024' into release-33.x

OpenNMS · Sep 13, 2024 · 16b976c · 16b976c
2 parents dfbbdd1 + 81822f2
commit 16b976c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/opennms-full-assembly/src/assembly/components/osgi.xml b/opennms-full-assembly/src/assembly/components/osgi.xml
@@ -13,6 +13,8 @@
         <exclude>**/*jasypt*/1.9.2_1/*</exclude>
         <exclude>**/jettison/1.3.*</exclude>
         <exclude>**/jettison/1.3.*/*</exclude>
+        <exclude>**/jettison/1.4.*</exclude>
+        <exclude>**/jettison/1.4.*/*</exclude>
         <exclude>**/proton-j/0.14.0/*</exclude>
         <exclude>**/proton-j/0.14.0</exclude>
         <exclude>**/proton-j/0.14.0/*</exclude>