FISH-7880 Update Bundle Plugin

appserver/admingui/faces-compat/pom.xml

@@ -3,7 +3,7 @@
   ~
   ~  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   ~
-  ~  Copyright (c) 2022 Payara Foundation and/or its affiliates. All rights reserved.
+  ~  Copyright (c) 2022-2023 Payara Foundation and/or its affiliates. All rights reserved.
   ~
   ~  The contents of this file are subject to the terms of either the GNU
   ~  General Public License Version 2 only ("GPL") or the Common Development
@@ -164,7 +164,7 @@
                                 <Export-Package>fish.payara.server.internal.admingui,
                                     !com.sun.faces.tlddoc-resources,
                                     com.sun.faces.*;com.sun.jsft.*;com.sun.jsftemplating.*;jakarta.faces.*;version="3.0";usage="admingui";mandatory:=usage</Export-Package>
-                                <Import-Package>!com.sun.faces.*,!jakarta.faces.*,!com.sun.jsftemplating.*,!com.sun.jsft,*</Import-Package>
+                                <Import-Package>!com.sun.faces.*,!jakarta.faces.*,!com.sun.jsftemplating.*,!com.sun.jsft,!org.apache.jasper.compiler,*</Import-Package>
                             </instructions>
                         </configuration>
                     </execution>

appserver/appclient/client/acc/osgi.bundle

@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright 2023 Payara Foundation and/or its affiliates.
 
 -exportcontents: \
                         org.glassfish.appclient.client; \
@@ -51,4 +52,5 @@
 # Making this import optional.
 Import-Package: \
                         org.jboss.weld.environment.se;resolution:=optional, \
+                        org.glassfish.appclient.client.acc.agent;resolution:=optional, \
                         *

appserver/jms/jms-core/osgi.bundle

@@ -37,9 +37,14 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright 2023 Payara Foundation and/or its affiliates
 
 -exportcontents: \
 			com.sun.enterprise.connectors.jms.deployment.annotation.handlers;\
 			com.sun.enterprise.connectors.jms.inflow;\
 			com.sun.enterprise.connectors.jms.system;\
 			com.sun.enterprise.connectors.jms.util; version=${project.osgi.version}
+
+# Optionally import package from OpenMQ for use by LegacyJmsRecoveryResourceHandler.
+# Version bounded simply for major version safety, if version 7 turns out to be fine adjust this bound
+Import-Package: com.sun.messaging.jmq.admin.jmsspi; version="[6.3,7)"; resolution:=optional, *

appserver/packager/external/ant/pom.xml

@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2017-2019] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright 2017-2023 Payara Foundation and/or its affiliates -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
@@ -98,6 +98,16 @@
                             !org.apache.tools.ant.util.java15,
                             !org.apache.tools.ant.taskdefs.optional,
                             !org.apache.env,
+                            !org.apache.harmony.luni.util,
+                            com.sun.tools.javah.*;resolution:=optional,
+                            gnu.classpath.*;resolution:=optional,
+                            gnu.gcj.*;resolution:=optional,
+                            javax.activation.*;resolution:=optional,
+                            javax.mail.internet.*;resolution:=optional,
+                            kaffe.util.*;resolution:=optional,
+                            org.tukaani.xz.*;resolution:=optional,
+                            sun.tools.native2ascii.*;resolution:=optional,
+                            weblogic.*;resolution:=optional,
                             *
                         </Import-Package>
                         <!-- !* matches with nothing, so no other class will be included in this bundle,

appserver/security/core-ee/osgi.bundle

@@ -37,7 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
-# Portions Copyright [2016,2019] [Payara Foundation]
+# Portions Copyright 2016-2023 Payara Foundation and/or its affiliates
 
 -exportcontents: \
                         com.sun.enterprise.security.acl; \
@@ -60,3 +60,6 @@
 
 # dependent flashlight package resolved at runtime
 DynamicImport-Package: org.glassfish.flashlight.provider
+
+# Don't import ourself!
+Import-Package: !com.sun.enterprise.security.acl, *

appserver/web/web-core/osgi.bundle

@@ -37,6 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+# Portions Copyright 2023 Payara Foundation and/or its affiliates
 
 -exportcontents: \
                         com.sun.enterprise.web.connector.grizzly; \
@@ -68,5 +69,5 @@
 # In this case, org.apache.jk.server is one such package. It is used
 # when mod_jk configuration is used. Since, it is not always needed,
 # the import has been marked as optional. By Sahoo.
-Import-Package: org.apache.jk.core;org.apache.jk.server; resolution:=optional; password=GlassFish; version=${project.osgi.version}, *
+Import-Package: org.apache.jk.core;org.apache.jk.server; resolution:=optional; password=GlassFish; version=${project.osgi.version}, !org.apache.xerces.impl, *
 

core/core-parent/pom.xml

@@ -412,27 +412,6 @@
                     </configuration>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>${maven.bundle.plugin.version}</version>
-                    <configuration>
-                        <!-- By default, we don't export anything. -->
-                        <Export-Package />
-                        <instructions>
-                            <!--
-                                Read all the configuration from osgi.bundle file, if it exists.
-                            -->
-                            <_include>-osgi.bundle</_include>
-                        </instructions>
-                        <excludeDependencies>tools-jar</excludeDependencies>
-                        <supportedProjectTypes>
-                            <supportedProjectType>glassfish-jar</supportedProjectType>
-                            <supportedProjectType>jar</supportedProjectType>
-                        </supportedProjectTypes>
-                    </configuration>
-                </plugin>
-
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-clean-plugin</artifactId>

core/pom.xml

@@ -171,7 +171,7 @@
         <maven.source.plugin.version>3.2.1</maven.source.plugin.version>
         <maven.javadoc.plugin.version>3.4.1</maven.javadoc.plugin.version>
         <maven.install.plugin.version>3.1.0</maven.install.plugin.version>
-        <maven.bundle.plugin.version>4.1.0</maven.bundle.plugin.version>
+        <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
         <maven.failsafe.plugin.version>3.0.0-M7</maven.failsafe.plugin.version>
         <maven.site.plugin.version>3.12.1</maven.site.plugin.version>
         <glassfishbuild.version>3.2.20.payara-p2</glassfishbuild.version>
@@ -468,6 +468,27 @@
                         <skip>${deploy.skip}</skip>
                     </configuration>
                 </plugin>
+
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>${maven.bundle.plugin.version}</version>
+                    <configuration>
+                        <instructions>
+                            <!--
+                                Read all the configuration from osgi.bundle file, if it exists.
+                            -->
+                            <_include>-osgi.bundle</_include>
+                            <!-- Don't import JDK packages -->
+                            <_noimportjava>true</_noimportjava>
+                        </instructions>
+                        <excludeDependencies>tools-jar</excludeDependencies>
+                        <supportedProjectTypes>
+                            <supportedProjectType>glassfish-jar</supportedProjectType>
+                            <supportedProjectType>jar</supportedProjectType>
+                        </supportedProjectTypes>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

nucleus/admin/rest/rest-service/osgi.bundle

@@ -37,7 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
-# Portions Copyright [2016] [Payara Foundation and/or its affiliates]
+# Portions Copyright 2016-2023 Payara Foundation and/or its affiliates
 
 -exportcontents: \
                         org.glassfish.admin.rest, \
@@ -57,4 +57,4 @@ DynamicImport-Package: \
 # e.g., in some embedded setup, we may disable logging altogether.
 # So, we need to mark it as an optional dependency. We can remove this
 # when admin team moves logging rest resources out of this module to logging module.
-Import-Package: com.sun.enterprise.server.logging.*; resolution:=optional, *;
+Import-Package: com.sun.enterprise.server.logging.*; resolution:=optional, !org.glassfish.admin.rest.resources.generatedASM, *;

nucleus/core/kernel/osgi.bundle

@@ -38,7 +38,7 @@
 # holder.
 #
 
-# Portions Copyright [2016-2019] [Payara Foundation and/or its affiliates]
+# Portions Copyright 2016-2023 Payara Foundation and/or its affiliates
 
 -exportcontents: \
                         com.sun.enterprise.v3.admin; \
@@ -67,4 +67,4 @@ DynamicImport-Package: fish.payara.nucleus.requesttracing, \
 # Only in non-OSGi embedded mode, kernel depends on logging package, so
 # optionally depend on that pkg. This way, when GF is embedded in 
 # OSGi environment, logging bundle need not be installed.
-Import-Package: com.sun.enterprise.server.logging.*; resolution:=optional, *
+Import-Package: com.sun.enterprise.server.logging.*; resolution:=optional, com.sun.tracing.*; resolution:=optional, *

nucleus/grizzly/nucleus-grizzly-all/pom.xml

@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!--"Portions Copyright [2017-2022] [Payara Foundation and/or its affiliates]" -->
+<!-- Portions Copyright 2017-2023 Payara Foundation and/or its affiliates -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -102,7 +102,7 @@
                         </goals>
                         <configuration>
                             <instructions>
-                                <Import-Package>*</Import-Package>
+                                <Import-Package>!android.os, sun.security.ssl; resolution:=optional, *</Import-Package>
                                 <DynamicImport-Package>*</DynamicImport-Package>
                                 <Export-Package>org.glassfish.grizzly.*</Export-Package>
                                 <Private-Package>org.glassfish.grizzly.*</Private-Package>

nucleus/packager/external/opentelemetry-repackaged/pom.xml

@@ -153,6 +153,10 @@
                             !org.checkerframework.checker.nullness.qual,
                             !org.conscrypt,sun.misc;version=!,
                             !javax.annotation.*,
+                            !com.android.*,
+                            !dalvik.*,
+                            io.opentelemetry.exporter.prometheus;resolution:=optional,
+                            sun.security.ssl;resolution:=optional,
                             *
                         </Import-Package>
                         <!-- Embed the dependencies and then shade them in next step -->

pom.xml

@@ -381,26 +381,6 @@
                     </configuration>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>${maven.bundle.plugin.version}</version>
-                    <configuration>
-                        <!-- By default, we don't export anything. -->
-                        <Export-Package />
-                        <instructions>
-                            <!--
-                                Read all the configuration from osgi.bundle file, if it exists.
-                            -->
-                            <_include>-osgi.bundle</_include>
-                        </instructions>
-                        <excludeDependencies>tools-jar</excludeDependencies>
-                        <supportedProjectTypes>
-                            <supportedProjectType>glassfish-jar</supportedProjectType>
-                            <supportedProjectType>jar</supportedProjectType>
-                        </supportedProjectTypes>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xml-maven-plugin</artifactId>