Fix OSGi headers for CDI & MP Jersey modules to be compatible with EE8 (#5122)

jansupol · web-flow · commit f0754eb2888a · 2022-08-26T15:34:00.000+02:00
Signed-off-by: jansupol &lt;jan.supol@oracle.com&gt;
diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml
@@ -57,6 +57,7 @@
                         <Export-Package>org.glassfish.jersey.server.validation.*;version=${project.version}</Export-Package>
                         <Import-Package>
                             ${javax.annotation.osgi.version},
+                            ${cdi.osgi.version},
                             javax.validation.*;resolution:=optional;version="${range;[==,3);${javax.validation.api.version}}",
                             *
                         </Import-Package>
diff --git a/ext/cdi/jersey-cdi-rs-inject/pom.xml b/ext/cdi/jersey-cdi-rs-inject/pom.xml
@@ -56,6 +56,20 @@
                     <show>package</show>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <inherited>true</inherited>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            ${cdi.osgi.version},
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/ext/cdi/jersey-cdi1x-servlet/pom.xml b/ext/cdi/jersey-cdi1x-servlet/pom.xml
@@ -92,6 +92,10 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.glassfish.jersey.ext.cdi1x.servlet.internal</Export-Package>
+                        <Import-Package>
+                            ${cdi.osgi.version},
+                            *
+                        </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,11 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.glassfish.jersey.ext.cdi1x.transaction.internal</Export-Package>
-                        <Import-Package>${javax.annotation.osgi.version},*</Import-Package>
+                        <Import-Package>
+                            ${javax.annotation.osgi.version},
+                            ${cdi.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,11 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.glassfish.jersey.ext.cdi1x.validation.internal;version=${project.version}</Export-Package>
-                        <Import-Package>${javax.annotation.osgi.version},*</Import-Package>
+                        <Import-Package>
+                            ${javax.annotation.osgi.version},
+                            ${cdi.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,7 @@
                         <Import-Package>
                             ${javax.annotation.osgi.version},
                             ${hk2.osgi.version},
+                            ${cdi.osgi.version},
                             *
                         </Import-Package>
                     </instructions>
diff --git a/ext/microprofile/mp-rest-client/pom.xml b/ext/microprofile/mp-rest-client/pom.xml
@@ -114,6 +114,8 @@
                             org.glassfish.jersey.restclient.*;version=${project.version}
                         </Export-Package>
                         <Import-Package>
+                            ${cdi.osgi.version},
+                            org.eclipse.microprofile.rest.client.*;version="[1,3)",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/incubator/cdi-inject-weld/pom.xml b/incubator/cdi-inject-weld/pom.xml
@@ -123,7 +123,8 @@
                         </Export-Package>
                         <Import-Package>
                             sun.misc.*;resolution:=optional,
-                            ${jakarta.annotation.osgi.version},
+                            ${cdi.osgi.version},
+                            ${javax.annotation.osgi.version},
                             *
                         </Import-Package>
                     </instructions>
diff --git a/inject/cdi2-se/pom.xml b/inject/cdi2-se/pom.xml
@@ -87,6 +87,7 @@
                         </Export-Package>
                         <Import-Package>
                             sun.misc.*;resolution:=optional,
+                            ${cdi.osgi.version},
                             ${javax.annotation.osgi.version},
                             *
                         </Import-Package>
diff --git a/pom.xml b/pom.xml
@@ -2207,6 +2207,7 @@
         <!-- do not need CQs -->
         <cdi.api.version>1.2</cdi.api.version>
         <cdi2.api.version>2.0.2</cdi2.api.version>
+        <cdi.osgi.version>javax.enterprise.*;version="[1,3)"</cdi.osgi.version>
         <ejb.version>3.2.6</ejb.version>
         <gf.impl.version>5.1.0</gf.impl.version>
         <grizzly.client.version>1.16</grizzly.client.version>
diff --git a/tests/integration/cdi-integration/gf-cdi-inject/arquillian.xml b/tests/integration/cdi-integration/gf-cdi-inject/arquillian.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+
+    Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns="http://jboss.org/schema/arquillian"
+            xsi:schemaLocation="http://jboss.org/schema/arquillian
+    http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+    <container qualifier="glassfish" default="true">
+        <configuration>
+            <property name="debug">true</property>
+        </configuration>
+    </container>
+
+</arquillian>
diff --git a/tests/integration/cdi-integration/gf-cdi-inject/pom.xml b/tests/integration/cdi-integration/gf-cdi-inject/pom.xml
diff --git a/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestApp.java b/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestApp.java
diff --git a/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestResource.java b/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestResource.java
diff --git a/tests/integration/cdi-integration/gf-cdi-inject/src/test/java/org/glassfish/jersey/tests/cdi/gf/GFTest.java b/tests/integration/cdi-integration/gf-cdi-inject/src/test/java/org/glassfish/jersey/tests/cdi/gf/GFTest.java
diff --git a/tests/integration/cdi-integration/pom.xml b/tests/integration/cdi-integration/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@`
`57`	`57`	`<Export-Package>org.glassfish.jersey.server.validation.*;version=${project.version}</Export-Package>`
`58`	`58`	`<Import-Package>`
`59`	`59`	`${javax.annotation.osgi.version},`
	`60`	`+ ${cdi.osgi.version},`
`60`	`61`	`javax.validation.*;resolution:=optional;version="${range;[==,3);${javax.validation.api.version}}",`
`61`	`62`	`*`
`62`	`63`	`</Import-Package>`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@`
`87`	`87`	`<Import-Package>`
`88`	`88`	`${javax.annotation.osgi.version},`
`89`	`89`	`${hk2.osgi.version},`
	`90`	`+ ${cdi.osgi.version},`
`90`	`91`	`*`
`91`	`92`	`</Import-Package>`
`92`	`93`	`</instructions>`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,8 @@`
`114`	`114`	`org.glassfish.jersey.restclient.*;version=${project.version}`
`115`	`115`	`</Export-Package>`
`116`	`116`	`<Import-Package>`
	`117`	`+ ${cdi.osgi.version},`
	`118`	`+ org.eclipse.microprofile.rest.client.*;version="[1,3)",`
`117`	`119`	`*`
`118`	`120`	`</Import-Package>`
`119`	`121`	`</instructions>`