From f4d10c472d3b38926e49ced1f0587fbc86ccf173 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 1 Nov 2021 11:25:02 +0000 Subject: [PATCH 1/3] FISH-5829 FISH-5830 Gmbal 4.0.3 & PFL 4.1.2 Signed-off-by: Andrew Pielage --- appserver/orb/orb-iiop/pom.xml | 4 ---- .../glassfish/admin/rest/composite/CompositeUtil.java | 7 +++++-- nucleus/packager/nucleus-corba-base/pom.xml | 5 ----- nucleus/pom.xml | 9 ++------- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/appserver/orb/orb-iiop/pom.xml b/appserver/orb/orb-iiop/pom.xml index 20c555dc7f6..3637ff2569d 100755 --- a/appserver/orb/orb-iiop/pom.xml +++ b/appserver/orb/orb-iiop/pom.xml @@ -99,10 +99,6 @@ org.glassfish.pfl pfl-dynamic - - org.glassfish.pfl - pfl-asm - fish.payara.server.internal.orb orb-connector diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java index 45f86d538ba..abc06157ac2 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java @@ -37,11 +37,12 @@ * only if the new code is made subject to such option by the copyright * holder. */ -//Portions Copyright [2016-2019] [Payara Foundation and/or affiliates] +//Portions Copyright [2016-2021] [Payara Foundation and/or affiliates] package org.glassfish.admin.rest.composite; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.admin.report.ActionReporter; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -84,6 +85,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; + import org.glassfish.admin.rest.RestExtension; import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.composite.metadata.AttributeReference; @@ -106,7 +108,8 @@ import org.glassfish.internal.api.Globals; import org.glassfish.jersey.media.sse.EventOutput; -import static org.glassfish.pfl.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; + import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.MessageInterpolatorImpl; diff --git a/nucleus/packager/nucleus-corba-base/pom.xml b/nucleus/packager/nucleus-corba-base/pom.xml index caeaa6825a8..689dcf28eeb 100644 --- a/nucleus/packager/nucleus-corba-base/pom.xml +++ b/nucleus/packager/nucleus-corba-base/pom.xml @@ -62,11 +62,6 @@ org.glassfish.corba glassfish-corba-internal-api - - org.glassfish.pfl - pfl-asm - true - org.glassfish.pfl pfl-basic diff --git a/nucleus/pom.xml b/nucleus/pom.xml index 7a119109332..c274fc0d687 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -150,9 +150,9 @@ build-217-jenkins-16 - 4.0.2.payara-p1 + 4.1.2 - 4.0.0 + 4.0.3 2.7.7 2.11.0 @@ -864,11 +864,6 @@ Parent is ${project.parent} pfl-basic-tools ${pfl.version} - - org.glassfish.pfl - pfl-asm - ${pfl.version} - org.glassfish.pfl pfl-tf From bd4454126add3878ab440bb47fedb55c67f705d7 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Tue, 2 Nov 2021 10:02:26 +0000 Subject: [PATCH 2/3] FISH-5829 Add GMBAL property Signed-off-by: Andrew Pielage --- .../admin/gf_template/src/main/resources/config/domain.xml | 2 ++ .../admin/gf_template_web/src/main/resources/config/domain.xml | 2 ++ .../src/main/resources/config/domain.xml | 2 ++ .../src/main/resources/config/domain.xml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/appserver/admin/gf_template/src/main/resources/config/domain.xml b/appserver/admin/gf_template/src/main/resources/config/domain.xml index a8aa51aedfb..e934a3b8124 100644 --- a/appserver/admin/gf_template/src/main/resources/config/domain.xml +++ b/appserver/admin/gf_template/src/main/resources/config/domain.xml @@ -317,6 +317,7 @@ + @@ -581,6 +582,7 @@ + diff --git a/appserver/admin/gf_template_web/src/main/resources/config/domain.xml b/appserver/admin/gf_template_web/src/main/resources/config/domain.xml index 10b9180bee0..b0dc4c40482 100644 --- a/appserver/admin/gf_template_web/src/main/resources/config/domain.xml +++ b/appserver/admin/gf_template_web/src/main/resources/config/domain.xml @@ -312,6 +312,7 @@ + @@ -571,6 +572,7 @@ + diff --git a/appserver/admin/production_domain_template/src/main/resources/config/domain.xml b/appserver/admin/production_domain_template/src/main/resources/config/domain.xml index dff784a8072..3a3ec469c27 100644 --- a/appserver/admin/production_domain_template/src/main/resources/config/domain.xml +++ b/appserver/admin/production_domain_template/src/main/resources/config/domain.xml @@ -269,6 +269,7 @@ + @@ -507,6 +508,7 @@ + diff --git a/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml b/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml index 0b4fd85482b..17daed73809 100644 --- a/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml +++ b/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml @@ -292,6 +292,7 @@ + @@ -523,6 +524,7 @@ + From 795e1ef3d98f941cf476737529d24882b9c12e21 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Wed, 3 Nov 2021 09:30:00 +0000 Subject: [PATCH 3/3] FISH-5829 FISH-5830 Copyright Signed-off-by: Andrew Pielage --- appserver/orb/orb-iiop/pom.xml | 2 +- nucleus/packager/nucleus-corba-base/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/appserver/orb/orb-iiop/pom.xml b/appserver/orb/orb-iiop/pom.xml index 3637ff2569d..6a6d43f671b 100755 --- a/appserver/orb/orb-iiop/pom.xml +++ b/appserver/orb/orb-iiop/pom.xml @@ -39,7 +39,7 @@ holder. --> - + 4.0.0 diff --git a/nucleus/packager/nucleus-corba-base/pom.xml b/nucleus/packager/nucleus-corba-base/pom.xml index 689dcf28eeb..2d9f69bde52 100644 --- a/nucleus/packager/nucleus-corba-base/pom.xml +++ b/nucleus/packager/nucleus-corba-base/pom.xml @@ -40,6 +40,7 @@ holder. --> + 4.0.0