From efa178caa6d2f60ceeabd4370234e763a8d09b89 Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@seanbright.com>
Date: Thu, 3 Oct 2024 20:21:16 -0400
Subject: [PATCH 1/2] bnd.bnd: Correct generated Import-Package OSGi header.

In 3.16.0, we switched from log4j 1.x to 2.x but neglected to update the `Import-Package` header with that change.

We now use bnd's default `Import-Package` functionality and override where necessary.
---
 bnd.bnd | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
index 23723bf1e..a2acf6699 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -9,8 +9,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 -exportcontents: !*.internal.*, *
 
 Import-Package: \
-	javax.net,\
-	javax.net.ssl,\
-	javax.script,\
-	org.apache.log4j;resolution:=optional,\
-	org.slf4j;resolution:=optional
+	!org.asteriskjava.*,\
+	org.apache.logging.log4j.*;resolution:=optional,\
+	org.slf4j.*;resolution:=optional,\
+	*

From a1fa3b51b9c5246d54f7a5d88b2e4e39ba4e54b6 Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@seanbright.com>
Date: Thu, 3 Oct 2024 20:21:47 -0400
Subject: [PATCH 2/2] MANIFEST.MF: Remove unused file.

---
 src/main/java/META-INF/MANIFEST.MF | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 src/main/java/META-INF/MANIFEST.MF

diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e9495128..000000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-