Dynamic imports of flashlight added back

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
eclipse-ee4j · Jul 30, 2023 · f30c3ce · f30c3ce
1 parent d8fb8ce
commit f30c3ce
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 1 deletion.
diff --git a/appserver/connectors/connectors-runtime/pom.xml b/appserver/connectors/connectors-runtime/pom.xml
@@ -191,6 +191,15 @@
         </resources>
         <plugins>
             <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <DynamicImport-Package>org.glassfish.flashlight.provider</DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+           <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>

diff --git a/appserver/connectors/work-management/pom.xml b/appserver/connectors/work-management/pom.xml
@@ -134,7 +134,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>
+                         <DynamicImport-Package>org.glassfish.flashlight.provider</DynamicImport-Package>
+                         <Export-Package>
                             com.sun.enterprise.connectors.work,
                             com.sun.enterprise.connectors.work.context
                         </Export-Package>

diff --git a/appserver/ejb/ejb-container/pom.xml b/appserver/ejb/ejb-container/pom.xml
@@ -255,6 +255,7 @@
                             org.glassfish.ejb.deployment.descriptor,
                             org.glassfish.ejb.deployment.descriptor.runtime
                         </Export-Package>
+                        <DynamicImport-Package>org.glassfish.flashlight.provider</DynamicImport-Package>
                         <!-- These packages are not required and unavailable in glassfish-web distribution -->
                         <Import-Package>
                             jakarta.xml.soap;resolution:=optional,

diff --git a/appserver/ejb/ejb-full-container/pom.xml b/appserver/ejb/ejb-full-container/pom.xml
@@ -51,4 +51,18 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <DynamicImport-Package>org.glassfish.flashlight.provider</DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/appserver/web/admin/pom.xml b/appserver/web/admin/pom.xml
@@ -153,6 +153,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <DynamicImport-Package>org.glassfish.flashlight.provider</DynamicImport-Package>
                         <Export-Package>
                             org.glassfish.web.admin.cli,
                             org.glassfish.web.admin.monitor

diff --git a/appserver/webservices/jsr109-impl/pom.xml b/appserver/webservices/jsr109-impl/pom.xml
@@ -145,6 +145,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <DynamicImport-Package>org.glassfish.flashlight.provider</DynamicImport-Package>
                         <Import-Package>
                             jakarta.ejb;resolution:=optional,
                             *

diff --git a/nucleus/deployment/common/pom.xml b/nucleus/deployment/common/pom.xml
@@ -128,6 +128,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <DynamicImport-Package>org.glassfish.flashlight.provider</DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>