The osgi.bundle files removed from 'appclient' modules

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

Hide file tree

Showing 5 changed files with 39 additions and 71 deletions.
diff --git a/appserver/appclient/client/acc-config/osgi.bundle b/appserver/appclient/client/acc-config/osgi.bundle
diff --git a/appserver/appclient/client/acc/osgi.bundle b/appserver/appclient/client/acc/osgi.bundle
diff --git a/appserver/appclient/client/acc/pom.xml b/appserver/appclient/client/acc/pom.xml
@@ -421,12 +421,35 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.glassfish.appclient.client,
+                            org.glassfish.appclient.client.acc,
+                            org.glassfish.appclient.client.acc.callbackhandler,
+                            org.glassfish.appclient.common
+                        </Export-Package>
+                        <!--
+                            This bundle is an OSGi bundle for convenience.
+                            However it needs org.jboss.weld.environment.se package, which isn't provided in GlassFish.
+                            The result is a non start-able OSGi bundle.
+                            Making this import optional.
+                        -->
+                        <Import-Package>
+                            !org.glassfish.appclient.client.acc.agent.*,
+                            org.jboss.weld.environment.se;resolution:=optional,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-
                     <archive>
-
                         <manifest>
                             <mainClass>org.glassfish.main.appclient.client.acc.AppClientCommand</mainClass>
                         </manifest>

diff --git a/appserver/appclient/server/core/osgi.bundle b/appserver/appclient/server/core/osgi.bundle
diff --git a/appserver/appclient/server/core/pom.xml b/appserver/appclient/server/core/pom.xml
@@ -103,4 +103,18 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.glassfish.appclient.server.core</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>