diff --git a/appserver/admingui/faces-compat/pom.xml b/appserver/admingui/faces-compat/pom.xml
index 0b56289f2d0..ed7764c1007 100644
--- a/appserver/admingui/faces-compat/pom.xml
+++ b/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 @@
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
- !com.sun.faces.*,!jakarta.faces.*,!com.sun.jsftemplating.*,!com.sun.jsft,*
+ !com.sun.faces.*,!jakarta.faces.*,!com.sun.jsftemplating.*,!com.sun.jsft,!org.apache.jasper.compiler,*
diff --git a/appserver/appclient/client/acc/osgi.bundle b/appserver/appclient/client/acc/osgi.bundle
index 0d34ae4547e..0b5a6cace75 100644
--- a/appserver/appclient/client/acc/osgi.bundle
+++ b/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, \
*
diff --git a/appserver/jms/jms-core/osgi.bundle b/appserver/jms/jms-core/osgi.bundle
index 5b59c97f1c6..f7c37a68831 100644
--- a/appserver/jms/jms-core/osgi.bundle
+++ b/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, *
diff --git a/appserver/packager/external/ant/pom.xml b/appserver/packager/external/ant/pom.xml
index 654c35f70a1..23a35eacd74 100644
--- a/appserver/packager/external/ant/pom.xml
+++ b/appserver/packager/external/ant/pom.xml
@@ -40,7 +40,7 @@
holder.
-->
-
+
@@ -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,
*
-
-
-
- <_include>-osgi.bundle
-
- tools-jar
-
- glassfish-jar
- jar
-
-
-
-
org.apache.maven.plugins
maven-clean-plugin
diff --git a/core/pom.xml b/core/pom.xml
index ad87df348e6..3b73dff513f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -171,7 +171,7 @@
3.2.1
3.4.1
3.1.0
- 4.1.0
+ 5.1.9
3.0.0-M7
3.12.1
3.2.20.payara-p2
@@ -468,6 +468,27 @@
${deploy.skip}
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ ${maven.bundle.plugin.version}
+
+
+
+ <_include>-osgi.bundle
+
+ <_noimportjava>true
+
+ tools-jar
+
+ glassfish-jar
+ jar
+
+
+
diff --git a/nucleus/admin/rest/rest-service/osgi.bundle b/nucleus/admin/rest/rest-service/osgi.bundle
index d722d7ef253..8439f9e841b 100644
--- a/nucleus/admin/rest/rest-service/osgi.bundle
+++ b/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, *;
diff --git a/nucleus/core/kernel/osgi.bundle b/nucleus/core/kernel/osgi.bundle
index 21e01af4787..3097a3c1aa6 100644
--- a/nucleus/core/kernel/osgi.bundle
+++ b/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, *
diff --git a/nucleus/grizzly/nucleus-grizzly-all/pom.xml b/nucleus/grizzly/nucleus-grizzly-all/pom.xml
index 80dfe4cb7d4..a1f0b7288ca 100644
--- a/nucleus/grizzly/nucleus-grizzly-all/pom.xml
+++ b/nucleus/grizzly/nucleus-grizzly-all/pom.xml
@@ -40,7 +40,7 @@
holder.
-->
-
+
4.0.0
@@ -102,7 +102,7 @@
- *
+ !android.os, sun.security.ssl; resolution:=optional, *
*
org.glassfish.grizzly.*
org.glassfish.grizzly.*
diff --git a/nucleus/packager/external/opentelemetry-repackaged/pom.xml b/nucleus/packager/external/opentelemetry-repackaged/pom.xml
index 2e54f04003d..b041c9945e6 100644
--- a/nucleus/packager/external/opentelemetry-repackaged/pom.xml
+++ b/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,
*
diff --git a/pom.xml b/pom.xml
index dbdd4da0bfd..1f4e1d852ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,26 +381,6 @@
-
- org.apache.felix
- maven-bundle-plugin
- ${maven.bundle.plugin.version}
-
-
-
-
-
- <_include>-osgi.bundle
-
- tools-jar
-
- glassfish-jar
- jar
-
-
-
org.codehaus.mojo
xml-maven-plugin