Fix OSGi veriables Signed-off-by: jansupol <jan.supol@oracle.com>
diff --git a/incubator/cdi-inject-weld/pom.xml b/incubator/cdi-inject-weld/pom.xml index 331b92f..ccfb4cd 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 e57899b..eaa7d25 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 eda140e..edfec7e 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>