Updated felix bundle plugin and fixed it's configuration

eclipse-ee4j · May 14, 2022 · 9580a57 · 9580a57
1 parent 51d82f0
commit 9580a57
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/nucleus/core/kernel/osgi.bundle b/nucleus/core/kernel/osgi.bundle
@@ -15,20 +15,21 @@
 #
 
 -exportcontents: \
-                        com.sun.enterprise.v3.admin; \
-                        com.sun.enterprise.v3.admin.adapter; \
-                        com.sun.enterprise.v3.admin.commands; \
-                        com.sun.enterprise.v3.bootstrap; \
-                        com.sun.enterprise.v3.common; \
-                        com.sun.enterprise.v3.server; \
-                        com.sun.enterprise.v3.services.impl; \
-                        org.glassfish.kernel.embedded; \
-                        org.glassfish.kernel.event; version=${project.osgi.version}
+    com.sun.enterprise.v3.admin; \
+    com.sun.enterprise.v3.admin.adapter; \
+    com.sun.enterprise.v3.admin.commands; \
+    com.sun.enterprise.v3.bootstrap; \
+    com.sun.enterprise.v3.common; \
+    com.sun.enterprise.v3.server; \
+    com.sun.enterprise.v3.services.impl; \
+    org.glassfish.kernel.embedded; \
+    org.glassfish.kernel.event; version=${project.osgi.version}
 
 # dependent flashlight package resolved at runtime
-DynamicImport-Package: org.glassfish.flashlight.provider, \
-                       org.objectweb.asm, \
-                       org.objectweb.asm.commons
+DynamicImport-Package: \
+    org.glassfish.flashlight.provider, \
+    org.objectweb.asm, \
+    org.objectweb.asm.commons
 
 # Only in non-OSGi embedded mode, kernel depends on logging package, so
 # optionally depend on that pkg. This way, when GF is embedded in

diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
@@ -755,7 +755,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.4</version>
+                    <version>5.1.6</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
@@ -1166,17 +1166,17 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
-                    <!-- By default, we don't export anything. -->
-                    <Export-Package />
-                    <instructions>
-                        <_include>-osgi.bundle</_include>
-                    </instructions>
                     <excludeDependencies>tools-jar</excludeDependencies>
+                    <niceManifest>true</niceManifest>
                     <supportedProjectTypes>
                         <supportedProjectType>glassfish-jar</supportedProjectType>
                         <supportedProjectType>jar</supportedProjectType>
                     </supportedProjectTypes>
-                    <niceManifest>true</niceManifest>
+                    <instructions>
+                        <_include>-osgi.bundle</_include>
+                        <_noimportjava>true</_noimportjava>
+                        <_runee>JavaSE-11</_runee>
+                    </instructions>
                 </configuration>
             </plugin>