From 20ca371da40b0b72bf5fe6e3319702b119e278a6 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 6 Oct 2023 17:38:26 +0100 Subject: [PATCH 01/16] FISH-7880 Update bundle plugin to 5.1.9 Signed-off-by: Andrew Pielage --- appserver/admingui/dataprovider/pom.xml | 2 +- appserver/web/war-util/osgi.bundle | 2 +- appserver/webservices/jsr109-impl/osgi.bundle | 2 +- appserver/webservices/soap-tcp/osgi.bundle | 2 +- core/core-parent/pom.xml | 6 +++-- core/pom.xml | 2 +- nucleus/grizzly/nucleus-grizzly-all/pom.xml | 2 +- nucleus/packager/external/vboxjws/pom.xml | 2 +- .../payara-modules/healthcheck-core/pom.xml | 24 ++++++++++++++++++- .../payara-modules/healthcheck-stuck/pom.xml | 19 +++++++++++++++ .../payara-executor-service/pom.xml | 22 +++++++++++++++++ pom.xml | 6 +++-- 12 files changed, 79 insertions(+), 12 deletions(-) diff --git a/appserver/admingui/dataprovider/pom.xml b/appserver/admingui/dataprovider/pom.xml index 9aa7a63299a..822a5f034c9 100644 --- a/appserver/admingui/dataprovider/pom.xml +++ b/appserver/admingui/dataprovider/pom.xml @@ -99,7 +99,7 @@ artifactId=dataprovider;inline=true; com.sun.data.*; password="GlassFish"; mandatory:=password - com.sun.sql.*;resolution:=optional,* + com.sun.sql.*;resolution:=optional, * true diff --git a/appserver/web/war-util/osgi.bundle b/appserver/web/war-util/osgi.bundle index 2cd99fd872c..27c4a93f2c5 100644 --- a/appserver/web/war-util/osgi.bundle +++ b/appserver/web/war-util/osgi.bundle @@ -53,4 +53,4 @@ # In this case, sun.rmi.transport is one such package which is used # during classloader cleanup. Since it is only presence for Oracle JDK, # the import has been marked as optional. -Import-Package: sun.rmi.transport; resolution:=optional, org.jboss.weld.interceptor.proxy,* +Import-Package: sun.rmi.transport; resolution:=optional, org.jboss.weld.interceptor.proxy, * diff --git a/appserver/webservices/jsr109-impl/osgi.bundle b/appserver/webservices/jsr109-impl/osgi.bundle index 29eece64159..34f7c050920 100644 --- a/appserver/webservices/jsr109-impl/osgi.bundle +++ b/appserver/webservices/jsr109-impl/osgi.bundle @@ -48,6 +48,6 @@ Import-Package: \ com.sun.enterprise.deployment.annotation.*, \ com.sun.enterprise.config.serverbeans, \ jakarta.ejb;resolution:=optional, \ - * + * # dependent flashlight package resolved at runtime DynamicImport-Package: org.glassfish.flashlight.provider diff --git a/appserver/webservices/soap-tcp/osgi.bundle b/appserver/webservices/soap-tcp/osgi.bundle index 282d0f0bf0a..965e2ab4a7f 100644 --- a/appserver/webservices/soap-tcp/osgi.bundle +++ b/appserver/webservices/soap-tcp/osgi.bundle @@ -45,4 +45,4 @@ Import-Package: \ org.glassfish.webservices.monitoring.*, \ org.glassfish.ejb.spi.*, \ com.sun.enterprise.deployment.*;resolution:=optional, \ - * + * diff --git a/core/core-parent/pom.xml b/core/core-parent/pom.xml index 8a03526d08a..b5adc247403 100644 --- a/core/core-parent/pom.xml +++ b/core/core-parent/pom.xml @@ -417,13 +417,15 @@ maven-bundle-plugin ${maven.bundle.plugin.version} - - + + <_include>-osgi.bundle + + <_noimportjava>true tools-jar diff --git a/core/pom.xml b/core/pom.xml index 64c7c16d011..10205e3d9f9 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 diff --git a/nucleus/grizzly/nucleus-grizzly-all/pom.xml b/nucleus/grizzly/nucleus-grizzly-all/pom.xml index 80dfe4cb7d4..8b19c635d7e 100644 --- a/nucleus/grizzly/nucleus-grizzly-all/pom.xml +++ b/nucleus/grizzly/nucleus-grizzly-all/pom.xml @@ -102,7 +102,7 @@ - * + !android.os, * * org.glassfish.grizzly.* org.glassfish.grizzly.* diff --git a/nucleus/packager/external/vboxjws/pom.xml b/nucleus/packager/external/vboxjws/pom.xml index 889573d3f4f..ec8dffd1cf7 100644 --- a/nucleus/packager/external/vboxjws/pom.xml +++ b/nucleus/packager/external/vboxjws/pom.xml @@ -81,7 +81,7 @@ *;inline=*.wsdl org.virtualbox_4_1.* - org.glassfish.virtualization.config,org.jvnet.hk2.annotations,jakarta.inject,org.jvnet.hk2.config,com.sun.xml.ws.developer,com.sun.xml.ws, com.sun.xml.ws.api.message,* + org.glassfish.virtualization.config,org.jvnet.hk2.annotations,jakarta.inject,org.jvnet.hk2.config,com.sun.xml.ws.developer,com.sun.xml.ws, com.sun.xml.ws.api.message, * + + + + + + + + + + + + + + + + + + + + + diff --git a/nucleus/payara-modules/healthcheck-stuck/pom.xml b/nucleus/payara-modules/healthcheck-stuck/pom.xml index 37b3ee299d8..433fccefbec 100644 --- a/nucleus/payara-modules/healthcheck-stuck/pom.xml +++ b/nucleus/payara-modules/healthcheck-stuck/pom.xml @@ -64,6 +64,25 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + + + + + + + + + + + + + + + + + + + diff --git a/nucleus/payara-modules/payara-executor-service/pom.xml b/nucleus/payara-modules/payara-executor-service/pom.xml index d9d8b66783f..c07a19f651a 100644 --- a/nucleus/payara-modules/payara-executor-service/pom.xml +++ b/nucleus/payara-modules/payara-executor-service/pom.xml @@ -66,4 +66,26 @@ internal-api + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 4942a4b417b..3b3bbba7129 100644 --- a/pom.xml +++ b/pom.xml @@ -386,13 +386,15 @@ maven-bundle-plugin ${maven.bundle.plugin.version} - - + + <_include>-osgi.bundle + + <_noimportjava>true tools-jar From 7fc4d6664f0b24dc9c466c16c274618c043254aa Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 9 Oct 2023 13:18:02 +0100 Subject: [PATCH 02/16] FISH-7880 Stop resolution issues with web-core and opentelemetry-repackaged Signed-off-by: Andrew Pielage --- appserver/web/web-core/osgi.bundle | 2 +- nucleus/packager/external/opentelemetry-repackaged/pom.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/appserver/web/web-core/osgi.bundle b/appserver/web/web-core/osgi.bundle index 764e7e23ce9..a514a33f464 100644 --- a/appserver/web/web-core/osgi.bundle +++ b/appserver/web/web-core/osgi.bundle @@ -68,5 +68,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, * diff --git a/nucleus/packager/external/opentelemetry-repackaged/pom.xml b/nucleus/packager/external/opentelemetry-repackaged/pom.xml index 88901ce6860..fdb4bc8af30 100644 --- a/nucleus/packager/external/opentelemetry-repackaged/pom.xml +++ b/nucleus/packager/external/opentelemetry-repackaged/pom.xml @@ -121,6 +121,9 @@ !org.checkerframework.checker.nullness.qual, !org.conscrypt,sun.misc;version=!, !javax.annotation.*, + !com.android.*, + !dalvik.*, + io.opentelemetry.exporter.prometheus;resolution:=optional, * From 04d83b388b8ee3a89ae7d0977f289813ae47563d Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 9 Oct 2023 16:41:04 +0100 Subject: [PATCH 03/16] FISH-7880 Stop resolution issues with rest-service Signed-off-by: Andrew Pielage --- nucleus/admin/rest/rest-service/osgi.bundle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nucleus/admin/rest/rest-service/osgi.bundle b/nucleus/admin/rest/rest-service/osgi.bundle index d722d7ef253..5af785b1eed 100644 --- a/nucleus/admin/rest/rest-service/osgi.bundle +++ b/nucleus/admin/rest/rest-service/osgi.bundle @@ -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, *; From 560b2214cd01a05927a707ed3f9b4f24922b2f93 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Tue, 10 Oct 2023 12:18:47 +0100 Subject: [PATCH 04/16] FISH-7880 Stop resolution issues with jms-core Signed-off-by: Andrew Pielage --- appserver/jms/jms-core/osgi.bundle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appserver/jms/jms-core/osgi.bundle b/appserver/jms/jms-core/osgi.bundle index 5b59c97f1c6..0661a010ed0 100644 --- a/appserver/jms/jms-core/osgi.bundle +++ b/appserver/jms/jms-core/osgi.bundle @@ -43,3 +43,7 @@ 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, * From fbcb782105c389bb22adc0f68eeb97877885ebbc Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Tue, 10 Oct 2023 12:24:32 +0100 Subject: [PATCH 05/16] FISH-7880 Stop resolution issues with faces-compat Signed-off-by: Andrew Pielage --- appserver/admingui/faces-compat/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/admingui/faces-compat/pom.xml b/appserver/admingui/faces-compat/pom.xml index 0b56289f2d0..f165b98e93e 100644 --- a/appserver/admingui/faces-compat/pom.xml +++ b/appserver/admingui/faces-compat/pom.xml @@ -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,* From ea2bc266d58195418d47ca9026a53341baad6ead Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Tue, 10 Oct 2023 15:49:17 +0100 Subject: [PATCH 06/16] FISH-7880 Copyright, cleanup, and formatting Signed-off-by: Andrew Pielage --- appserver/admingui/dataprovider/pom.xml | 2 +- appserver/admingui/faces-compat/pom.xml | 2 +- appserver/jms/jms-core/osgi.bundle | 1 + appserver/web/war-util/osgi.bundle | 2 +- appserver/web/web-core/osgi.bundle | 1 + appserver/webservices/jsr109-impl/osgi.bundle | 2 +- appserver/webservices/soap-tcp/osgi.bundle | 2 +- core/core-parent/pom.xml | 23 ------------------ core/pom.xml | 21 ++++++++++++++++ nucleus/admin/rest/rest-service/osgi.bundle | 2 +- nucleus/grizzly/nucleus-grizzly-all/pom.xml | 2 +- nucleus/packager/external/vboxjws/pom.xml | 2 +- .../payara-modules/healthcheck-core/pom.xml | 24 +------------------ .../payara-modules/healthcheck-stuck/pom.xml | 19 --------------- .../payara-executor-service/pom.xml | 22 ----------------- pom.xml | 22 ----------------- 16 files changed, 32 insertions(+), 117 deletions(-) diff --git a/appserver/admingui/dataprovider/pom.xml b/appserver/admingui/dataprovider/pom.xml index 822a5f034c9..9aa7a63299a 100644 --- a/appserver/admingui/dataprovider/pom.xml +++ b/appserver/admingui/dataprovider/pom.xml @@ -99,7 +99,7 @@ artifactId=dataprovider;inline=true; com.sun.data.*; password="GlassFish"; mandatory:=password - com.sun.sql.*;resolution:=optional, * + com.sun.sql.*;resolution:=optional,* true diff --git a/appserver/admingui/faces-compat/pom.xml b/appserver/admingui/faces-compat/pom.xml index f165b98e93e..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 diff --git a/appserver/jms/jms-core/osgi.bundle b/appserver/jms/jms-core/osgi.bundle index 0661a010ed0..f7c37a68831 100644 --- a/appserver/jms/jms-core/osgi.bundle +++ b/appserver/jms/jms-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.connectors.jms.deployment.annotation.handlers;\ diff --git a/appserver/web/war-util/osgi.bundle b/appserver/web/war-util/osgi.bundle index 27c4a93f2c5..2cd99fd872c 100644 --- a/appserver/web/war-util/osgi.bundle +++ b/appserver/web/war-util/osgi.bundle @@ -53,4 +53,4 @@ # In this case, sun.rmi.transport is one such package which is used # during classloader cleanup. Since it is only presence for Oracle JDK, # the import has been marked as optional. -Import-Package: sun.rmi.transport; resolution:=optional, org.jboss.weld.interceptor.proxy, * +Import-Package: sun.rmi.transport; resolution:=optional, org.jboss.weld.interceptor.proxy,* diff --git a/appserver/web/web-core/osgi.bundle b/appserver/web/web-core/osgi.bundle index a514a33f464..4ae66076817 100644 --- a/appserver/web/web-core/osgi.bundle +++ b/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; \ diff --git a/appserver/webservices/jsr109-impl/osgi.bundle b/appserver/webservices/jsr109-impl/osgi.bundle index 34f7c050920..29eece64159 100644 --- a/appserver/webservices/jsr109-impl/osgi.bundle +++ b/appserver/webservices/jsr109-impl/osgi.bundle @@ -48,6 +48,6 @@ Import-Package: \ com.sun.enterprise.deployment.annotation.*, \ com.sun.enterprise.config.serverbeans, \ jakarta.ejb;resolution:=optional, \ - * + * # dependent flashlight package resolved at runtime DynamicImport-Package: org.glassfish.flashlight.provider diff --git a/appserver/webservices/soap-tcp/osgi.bundle b/appserver/webservices/soap-tcp/osgi.bundle index 965e2ab4a7f..282d0f0bf0a 100644 --- a/appserver/webservices/soap-tcp/osgi.bundle +++ b/appserver/webservices/soap-tcp/osgi.bundle @@ -45,4 +45,4 @@ Import-Package: \ org.glassfish.webservices.monitoring.*, \ org.glassfish.ejb.spi.*, \ com.sun.enterprise.deployment.*;resolution:=optional, \ - * + * diff --git a/core/core-parent/pom.xml b/core/core-parent/pom.xml index b5adc247403..dfeafb70081 100644 --- a/core/core-parent/pom.xml +++ b/core/core-parent/pom.xml @@ -412,29 +412,6 @@ - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.plugin.version} - - - - - - <_include>-osgi.bundle - - <_noimportjava>true - - tools-jar - - glassfish-jar - jar - - - - org.apache.maven.plugins maven-clean-plugin diff --git a/core/pom.xml b/core/pom.xml index 10205e3d9f9..12078994d9f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -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 5af785b1eed..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, \ diff --git a/nucleus/grizzly/nucleus-grizzly-all/pom.xml b/nucleus/grizzly/nucleus-grizzly-all/pom.xml index 8b19c635d7e..0e5c21d3ee0 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 diff --git a/nucleus/packager/external/vboxjws/pom.xml b/nucleus/packager/external/vboxjws/pom.xml index ec8dffd1cf7..889573d3f4f 100644 --- a/nucleus/packager/external/vboxjws/pom.xml +++ b/nucleus/packager/external/vboxjws/pom.xml @@ -81,7 +81,7 @@ *;inline=*.wsdl org.virtualbox_4_1.* - org.glassfish.virtualization.config,org.jvnet.hk2.annotations,jakarta.inject,org.jvnet.hk2.config,com.sun.xml.ws.developer,com.sun.xml.ws, com.sun.xml.ws.api.message, * + org.glassfish.virtualization.config,org.jvnet.hk2.annotations,jakarta.inject,org.jvnet.hk2.config,com.sun.xml.ws.developer,com.sun.xml.ws, com.sun.xml.ws.api.message,* - - - - - - - - - - - - - - - - - - - - - + diff --git a/nucleus/payara-modules/healthcheck-stuck/pom.xml b/nucleus/payara-modules/healthcheck-stuck/pom.xml index 433fccefbec..37b3ee299d8 100644 --- a/nucleus/payara-modules/healthcheck-stuck/pom.xml +++ b/nucleus/payara-modules/healthcheck-stuck/pom.xml @@ -64,25 +64,6 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - - - - - - - - - - - - - - - - - - - diff --git a/nucleus/payara-modules/payara-executor-service/pom.xml b/nucleus/payara-modules/payara-executor-service/pom.xml index c07a19f651a..d9d8b66783f 100644 --- a/nucleus/payara-modules/payara-executor-service/pom.xml +++ b/nucleus/payara-modules/payara-executor-service/pom.xml @@ -66,26 +66,4 @@ internal-api - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 3b3bbba7129..4854ba680c0 100644 --- a/pom.xml +++ b/pom.xml @@ -381,28 +381,6 @@ - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.plugin.version} - - - - - - <_include>-osgi.bundle - - <_noimportjava>true - - tools-jar - - glassfish-jar - jar - - - org.codehaus.mojo xml-maven-plugin From 105dcbbf9b839932cd3878f895bb9d09bb4d6643 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 19 Oct 2023 13:21:51 +0100 Subject: [PATCH 07/16] FISH-7880 Stop resolution issues with Ant Signed-off-by: Andrew Pielage --- appserver/packager/external/ant/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/appserver/packager/external/ant/pom.xml b/appserver/packager/external/ant/pom.xml index 654c35f70a1..0d5f471c994 100644 --- a/appserver/packager/external/ant/pom.xml +++ b/appserver/packager/external/ant/pom.xml @@ -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, * From c4cd5e0c0cb531b364678003f48f5f4aa20416b7 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 20 Oct 2023 09:51:50 +0100 Subject: [PATCH 11/16] FISH-7880 Don't import own package Signed-off-by: Andrew Pielage --- appserver/security/core-ee/osgi.bundle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appserver/security/core-ee/osgi.bundle b/appserver/security/core-ee/osgi.bundle index 83eeb50b887..ce639d38b3b 100644 --- a/appserver/security/core-ee/osgi.bundle +++ b/appserver/security/core-ee/osgi.bundle @@ -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, * From 9257241a94aff48074365f841ddf810d732ec212 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 20 Oct 2023 10:26:44 +0100 Subject: [PATCH 12/16] FISH-7880 Make org.glassfish.appclient.client.acc.agent optional Signed-off-by: Andrew Pielage --- appserver/appclient/client/acc/osgi.bundle | 1 + 1 file changed, 1 insertion(+) diff --git a/appserver/appclient/client/acc/osgi.bundle b/appserver/appclient/client/acc/osgi.bundle index 0d34ae4547e..d1c01683556 100644 --- a/appserver/appclient/client/acc/osgi.bundle +++ b/appserver/appclient/client/acc/osgi.bundle @@ -51,4 +51,5 @@ # Making this import optional. Import-Package: \ org.jboss.weld.environment.se;resolution:=optional, \ + org.glassfish.appclient.client.acc.agent;resolution:=optional, \ * From bcc69b7c756d777b35e66ad4eb244d71794ecb87 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 20 Oct 2023 11:05:56 +0100 Subject: [PATCH 13/16] FISH-7880 Copyright Signed-off-by: Andrew Pielage --- appserver/appclient/client/acc/osgi.bundle | 1 + appserver/security/core-ee/osgi.bundle | 2 +- nucleus/core/kernel/osgi.bundle | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/appserver/appclient/client/acc/osgi.bundle b/appserver/appclient/client/acc/osgi.bundle index d1c01683556..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; \ diff --git a/appserver/security/core-ee/osgi.bundle b/appserver/security/core-ee/osgi.bundle index ce639d38b3b..c753b3fbdd5 100644 --- a/appserver/security/core-ee/osgi.bundle +++ b/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 -exportcontents: \ com.sun.enterprise.security.acl; \ diff --git a/nucleus/core/kernel/osgi.bundle b/nucleus/core/kernel/osgi.bundle index c1838eb107c..388916418fc 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; \ From 6b93b5a4fc934af44a087cc21bb1ae9326d3403c Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 20 Oct 2023 11:07:06 +0100 Subject: [PATCH 14/16] FISH-7880 More copyright Signed-off-by: Andrew Pielage --- appserver/packager/external/ant/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/packager/external/ant/pom.xml b/appserver/packager/external/ant/pom.xml index b4be946ffba..23a35eacd74 100644 --- a/appserver/packager/external/ant/pom.xml +++ b/appserver/packager/external/ant/pom.xml @@ -40,7 +40,7 @@ holder. --> - + From b016dedb073d9fc9a4ad8bf8987f786309881ba5 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 23 Oct 2023 09:30:31 +0100 Subject: [PATCH 15/16] Fix copyright --- appserver/security/core-ee/osgi.bundle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/security/core-ee/osgi.bundle b/appserver/security/core-ee/osgi.bundle index c753b3fbdd5..d6b158e7c3b 100644 --- a/appserver/security/core-ee/osgi.bundle +++ b/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-2023 Payara Foundation +# Portions Copyright 2016-2023 Payara Foundation and/or its affiliates -exportcontents: \ com.sun.enterprise.security.acl; \ From fb558553af35994f6d9ec51f2a9a6f71e6fa115b Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 23 Oct 2023 09:33:50 +0100 Subject: [PATCH 16/16] Errant space --- nucleus/core/kernel/osgi.bundle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nucleus/core/kernel/osgi.bundle b/nucleus/core/kernel/osgi.bundle index 388916418fc..3097a3c1aa6 100644 --- a/nucleus/core/kernel/osgi.bundle +++ b/nucleus/core/kernel/osgi.bundle @@ -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, com.sun.tracing.*; resolution:=optional , * +Import-Package: com.sun.enterprise.server.logging.*; resolution:=optional, com.sun.tracing.*; resolution:=optional, *