The osgi.bundle files removed from 'osgi' modules

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

Hide file tree

Showing 6 changed files with 53 additions and 66 deletions.
diff --git a/appserver/osgi-platforms/felix-webconsole-extension/osgi.bundle b/appserver/osgi-platforms/felix-webconsole-extension/osgi.bundle
diff --git a/appserver/osgi-platforms/felix-webconsole-extension/pom.xml b/appserver/osgi-platforms/felix-webconsole-extension/pom.xml
@@ -77,4 +77,18 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-Activator>org.glassfish.osgi.felixwebconsoleextension.FelixWebConsoleExtensionActivator</Bundle-Activator>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/nucleus/osgi-platforms/osgi-cli-interactive/osgi.bundle b/nucleus/osgi-platforms/osgi-cli-interactive/osgi.bundle
diff --git a/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml b/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml
@@ -80,6 +80,16 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!-- Nothing to export -->
+                        <Export-Package></Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/nucleus/osgi-platforms/osgi-cli-remote/osgi.bundle b/nucleus/osgi-platforms/osgi-cli-remote/osgi.bundle
diff --git a/nucleus/osgi-platforms/osgi-cli-remote/pom.xml b/nucleus/osgi-platforms/osgi-cli-remote/pom.xml
@@ -68,4 +68,33 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!-- Nothing to export -->
+                        <Export-Package></Export-Package>
+                        <!--
+                        Bnd is not smart enough to know that dynamic imported packages should not
+                        be regularly imported. We have to exclude those manually.
+                        -->
+                        <Import-Package>
+                            !org.apache.felix.shell,
+                            !org.apache.felix.service.command,
+                            *
+                        </Import-Package>
+                        <!-- shell packages are resolved at runtime, whatever there is -->
+                        <DynamicImport-Package>
+                            org.apache.felix.shell,
+                            org.apache.felix.service.command
+                        </DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>