OSGi version requirements for jakarta.enterprise explicitly added
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml
index 6371303..c1fc9c4 100644
--- a/ext/bean-validation/pom.xml
+++ b/ext/bean-validation/pom.xml
@@ -58,6 +58,8 @@
<Import-Package>
${jakarta.annotation.osgi.version},
jakarta.validation.*;resolution:=optional;version="[3,4)",
+ jakarta.enterprise.*;version="[3.0,5)",
+ jakarta.decorator.*;version="[3.0,5)",
*
</Import-Package>
</instructions>
diff --git a/ext/cdi/jersey-cdi1x-servlet/pom.xml b/ext/cdi/jersey-cdi1x-servlet/pom.xml
index db579a8..3996e6e 100644
--- a/ext/cdi/jersey-cdi1x-servlet/pom.xml
+++ b/ext/cdi/jersey-cdi1x-servlet/pom.xml
@@ -86,6 +86,11 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.ext.cdi1x.servlet.internal</Export-Package>
+ <Import-Package>
+ jakarta.enterprise.*;version="[3.0,5)",
+ jakarta.decorator.*;version="[3.0,5)",
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/ext/cdi/jersey-cdi1x-transaction/pom.xml b/ext/cdi/jersey-cdi1x-transaction/pom.xml
index e63aeb8..abcbdb2 100644
--- a/ext/cdi/jersey-cdi1x-transaction/pom.xml
+++ b/ext/cdi/jersey-cdi1x-transaction/pom.xml
@@ -91,7 +91,12 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.ext.cdi1x.transaction.internal</Export-Package>
- <Import-Package>${jakarta.annotation.osgi.version},*</Import-Package>
+ <Import-Package>
+ jakarta.enterprise.*;version="[3.0,5)",
+ jakarta.decorator.*;version="[3.0,5)",
+ ${jakarta.annotation.osgi.version},
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/ext/cdi/jersey-cdi1x-validation/pom.xml b/ext/cdi/jersey-cdi1x-validation/pom.xml
index 8dfe43e..c7181e2 100644
--- a/ext/cdi/jersey-cdi1x-validation/pom.xml
+++ b/ext/cdi/jersey-cdi1x-validation/pom.xml
@@ -103,7 +103,12 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.ext.cdi1x.validation.internal;version=${project.version}</Export-Package>
- <Import-Package>${jakarta.annotation.osgi.version},*</Import-Package>
+ <Import-Package>
+ jakarta.enterprise.*;version="[3.0,5)",
+ jakarta.decorator.*;version="[3.0,5)",
+ ${jakarta.annotation.osgi.version},
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/ext/cdi/jersey-cdi1x/pom.xml b/ext/cdi/jersey-cdi1x/pom.xml
index ced26bf..5da46b0 100644
--- a/ext/cdi/jersey-cdi1x/pom.xml
+++ b/ext/cdi/jersey-cdi1x/pom.xml
@@ -87,6 +87,8 @@
<Import-Package>
${jakarta.annotation.osgi.version},
${hk2.osgi.version},
+ jakarta.enterprise.*;version="[3.0,5)",
+ jakarta.decorator.*;version="[3.0,5)",
*
</Import-Package>
</instructions>
diff --git a/ext/microprofile/mp-rest-client/pom.xml b/ext/microprofile/mp-rest-client/pom.xml
index 0930844..8f6c282 100644
--- a/ext/microprofile/mp-rest-client/pom.xml
+++ b/ext/microprofile/mp-rest-client/pom.xml
@@ -118,6 +118,8 @@
org.glassfish.jersey.restclient.*;version=${project.version}
</Export-Package>
<Import-Package>
+ jakarta.enterprise.*;version="[3.0,5)",
+ jakarta.decorator.*;version="[3.0,5)",
*
</Import-Package>
</instructions>
diff --git a/incubator/cdi-inject-weld/pom.xml b/incubator/cdi-inject-weld/pom.xml
index cc548c0..27bc1b4 100644
--- a/incubator/cdi-inject-weld/pom.xml
+++ b/incubator/cdi-inject-weld/pom.xml
@@ -124,6 +124,8 @@
<Import-Package>
sun.misc.*;resolution:=optional,
${jakarta.annotation.osgi.version},
+ jakarta.enterprise.*;version="[3.0,5)",
+ jakarta.decorator.*;version="[3.0,5)",
*
</Import-Package>
</instructions>
diff --git a/inject/cdi2-se/pom.xml b/inject/cdi2-se/pom.xml
index 580350f..231f137 100644
--- a/inject/cdi2-se/pom.xml
+++ b/inject/cdi2-se/pom.xml
@@ -91,6 +91,8 @@
</Export-Package>
<Import-Package>
sun.misc.*;resolution:=optional,
+ jakarta.enterprise.*;version="[3.0,5)",
+ jakarta.decorator.*;version="[3.0,5)",
${jakarta.annotation.osgi.version},
*
</Import-Package>
diff --git a/pom.xml b/pom.xml
index 1ab9e65..ba4e6dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2073,8 +2073,8 @@
<hamcrest.version>1.3</hamcrest.version>
<helidon.version>1.0.3</helidon.version>
<xmlunit.version>1.6</xmlunit.version>
- <hk2.osgi.version>org.glassfish.hk2.*;version="[2.5,4)"</hk2.osgi.version>
- <hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[2.5,4)"</hk2.jvnet.osgi.version>
+ <hk2.osgi.version>org.glassfish.hk2.*;version="[3.0,4)"</hk2.osgi.version>
+ <hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[3.0,4)"</hk2.jvnet.osgi.version>
<hk2.config.version>6.0.0</hk2.config.version>
<httpclient.version>4.5.13</httpclient.version>
<jackson.version>2.13.0</jackson.version>
