OSGi version requirements for jakarta.enterprise explicitly added

senivam · senivam · commit 627a1df20e49 · 2021-12-22T11:29:28.000+01:00
Signed-off-by: Maxim Nesen &lt;maxim.nesen@oracle.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@`
`58`	`58`	`<Import-Package>`
`59`	`59`	`${jakarta.annotation.osgi.version},`
`60`	`60`	`jakarta.validation.*;resolution:=optional;version="[3,4)",`
	`61`	`+ jakarta.enterprise.*;version="[3.0,5)",`
	`62`	`+ jakarta.decorator.*;version="[3.0,5)",`
`61`	`63`	`*`
`62`	`64`	`</Import-Package>`
`63`	`65`	`</instructions>`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@`
`87`	`87`	`<Import-Package>`
`88`	`88`	`${jakarta.annotation.osgi.version},`
`89`	`89`	`${hk2.osgi.version},`
	`90`	`+ jakarta.enterprise.*;version="[3.0,5)",`
	`91`	`+ jakarta.decorator.*;version="[3.0,5)",`
`90`	`92`	`*`
`91`	`93`	`</Import-Package>`
`92`	`94`	`</instructions>`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,8 @@`
`118`	`118`	`org.glassfish.jersey.restclient.*;version=${project.version}`
`119`	`119`	`</Export-Package>`
`120`	`120`	`<Import-Package>`
	`121`	`+ jakarta.enterprise.*;version="[3.0,5)",`
	`122`	`+ jakarta.decorator.*;version="[3.0,5)",`
`121`	`123`	`*`
`122`	`124`	`</Import-Package>`
`123`	`125`	`</instructions>`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,8 @@`
`124`	`124`	`<Import-Package>`
`125`	`125`	`sun.misc.*;resolution:=optional,`
`126`	`126`	`${jakarta.annotation.osgi.version},`
	`127`	`+ jakarta.enterprise.*;version="[3.0,5)",`
	`128`	`+ jakarta.decorator.*;version="[3.0,5)",`
`127`	`129`	`*`
`128`	`130`	`</Import-Package>`
`129`	`131`	`</instructions>`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,8 @@`
`91`	`91`	`</Export-Package>`
`92`	`92`	`<Import-Package>`
`93`	`93`	`sun.misc.*;resolution:=optional,`
	`94`	`+ jakarta.enterprise.*;version="[3.0,5)",`
	`95`	`+ jakarta.decorator.*;version="[3.0,5)",`
`94`	`96`	`${jakarta.annotation.osgi.version},`
`95`	`97`	`*`
`96`	`98`	`</Import-Package>`