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

OpenNMS · Sep 16, 2024 · e765ae0 · e765ae0
2 parents 7cb54e3 + 16b976c
commit e765ae0
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>