From c465c3881beff1c442db63e3729ab4a3f3d367a4 Mon Sep 17 00:00:00 2001
From: jansupol <jan.supol@oracle.com>
Date: Fri, 2 Sep 2022 18:31:18 +0200
Subject: [PATCH] Fix OSGi veriables

Signed-off-by: jansupol <jan.supol@oracle.com>
---
 incubator/cdi-inject-weld/pom.xml | 2 +-
 media/json-gson/pom.xml           | 2 +-
 pom.xml                           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/incubator/cdi-inject-weld/pom.xml b/incubator/cdi-inject-weld/pom.xml
index 331b92f17e..ccfb4cdcb7 100644
--- a/incubator/cdi-inject-weld/pom.xml
+++ b/incubator/cdi-inject-weld/pom.xml
@@ -124,7 +124,7 @@
                         <Import-Package>
                             sun.misc.*;resolution:=optional,
                             ${cdi.osgi.version},
-                            ${javax.annotation.osgi.version},
+                            ${jakarta.annotation.osgi.version},
                             *
                         </Import-Package>
                     </instructions>
diff --git a/media/json-gson/pom.xml b/media/json-gson/pom.xml
index e57899b9da..eaa7d25ab5 100644
--- a/media/json-gson/pom.xml
+++ b/media/json-gson/pom.xml
@@ -54,7 +54,7 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.glassfish.jersey.gson.*</Export-Package>
-                        <Import-Package>${javax.annotation.osgi.version},*</Import-Package>
+                        <Import-Package>${jakarta.annotation.osgi.version},*</Import-Package>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
                 </configuration>
diff --git a/pom.xml b/pom.xml
index eda140e8fa..edfec7ec64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2109,7 +2109,7 @@
         each module; the default exclude filter file is at etc/config/findbugs-exclude.xml -->
         <findbugs.exclude />
         <findbugs.glassfish.logging.validLoggerPrefixes>
-            javax.enterprise
+            jakarta.enterprise
         </findbugs.glassfish.logging.validLoggerPrefixes>
         <java.version>1.8</java.version>
 <!--        <jersey.repackaged.prefix>jersey.repackaged</jersey.repackaged.prefix>-->
@@ -2221,7 +2221,7 @@
         <hk2.config.version>6.2.5</hk2.config.version>
         <!-- Jakartified -->
         <cdi.api.version>3.0.0</cdi.api.version>
-        <cdi.osgi.version>javax.enterprise.*;version="[3.0,5)"</cdi.osgi.version>
+        <cdi.osgi.version>jakarta.enterprise.*;version="[3.0,5)"</cdi.osgi.version>
         <ejb.version>4.0.1</ejb.version>
         <grizzly2.version>3.0.1</grizzly2.version>
         <grizzly.npn.version>2.0.0</grizzly.npn.version>