From 968f4bcd71bc4f2e8a45cc8e4a44ff130de92bd3 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Thu, 20 Apr 2023 18:36:43 +0200
Subject: [PATCH] Completely remove OSGi Import-Package 'javax.annotation'

This package is not required at runtime.

Additionally update to latest maven-bundle-plugin 5.1.8.

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
---
 core/pom.xml | 2 +-
 pom.xml      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 368f98f78d..fc67192b12 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -149,7 +149,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>${project.artifactId}</Bundle-Name>
-            <Import-Package>!org.objectweb.asm.*,!com.google.inject.*,*</Import-Package>
+            <Import-Package>!org.objectweb.asm.*,!com.google.inject.*,!javax.annotation,*</Import-Package>
             <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
           </instructions>
         </configuration>
diff --git a/pom.xml b/pom.xml
index eb64477959..5935c59e1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,9 +344,8 @@ See the Apache License Version 2.0 for the specific language governing permissio
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>5.1.2</version>
+          <version>5.1.8</version>
           <configuration>
-            <excludeDependencies>jsr305</excludeDependencies>
             <instructions>
               <module>com.google.inject</module>
               <_include>-${project.basedir}/build.properties</_include>
@@ -355,7 +354,7 @@ See the Apache License Version 2.0 for the specific language governing permissio
               <Bundle-Name>${project.artifactId}</Bundle-Name>
               <Bundle-SymbolicName>$(module)</Bundle-SymbolicName>
               <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
-              <Import-Package>!com.google.inject.*,*</Import-Package>
+              <Import-Package>!com.google.inject.*,!javax.annotation,*</Import-Package>
               <_exportcontents>!*.internal.*,$(module).*;version=${guice.api.version}</_exportcontents>
               <_consumer-policy>$(version;==;$(@))</_consumer-policy>
               <_nouses>true</_nouses>