From 5186fe6b628199f981e19772d3889f52a518e3f9 Mon Sep 17 00:00:00 2001 From: Rhys Williams <170514543+Viii3@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:31:37 +0100 Subject: [PATCH 01/49] Merge pull request #6869 from Viii3/FISH-9111-Community6 FISH-9111 stax2-api dependency. --- nucleus/packager/nucleus-jersey/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nucleus/packager/nucleus-jersey/pom.xml b/nucleus/packager/nucleus-jersey/pom.xml index f6ec892ce85..de5449e2c36 100644 --- a/nucleus/packager/nucleus-jersey/pom.xml +++ b/nucleus/packager/nucleus-jersey/pom.xml @@ -138,6 +138,10 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml + + org.codehaus.woodstox + stax2-api + org.yaml snakeyaml From 50b8333346bd1fcdb611fdd41ff22cfb21e6e2c6 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Wed, 14 Aug 2024 09:21:52 +0100 Subject: [PATCH 02/49] Merge pull request #6887 from payara/dependabot/maven/main/io.fabric8-docker-maven-plugin-0.45.0 Bump io.fabric8:docker-maven-plugin from 0.44.0 to 0.45.0 --- appserver/extras/docker-images/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/extras/docker-images/pom.xml b/appserver/extras/docker-images/pom.xml index ba1156e4659..5ce8d9a2803 100644 --- a/appserver/extras/docker-images/pom.xml +++ b/appserver/extras/docker-images/pom.xml @@ -87,7 +87,7 @@ io.fabric8 docker-maven-plugin - 0.44.0 + 0.45.0 true true From 8742f73d1f0e357351b6b9605f0bfce9dca062c9 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Wed, 14 Aug 2024 09:26:28 +0100 Subject: [PATCH 03/49] Merge pull request #6874 from payara/dependabot/maven/main/io.smallrye.common-smallrye-common-function-2.5.0 Bump io.smallrye.common:smallrye-common-function from 1.8.0 to 2.5.0 --- .../repackaged/smallrye-config-repackaged/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml index cede7c88824..297297e55cb 100644 --- a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml @@ -152,7 +152,7 @@ io.smallrye.common smallrye-common-function - 1.8.0 + 2.5.0 true From 0570a37b5ed4f3c20e6631f4db284d9e6c414a40 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Wed, 14 Aug 2024 10:44:27 +0100 Subject: [PATCH 04/49] Merge pull request #6885 from payara/dependabot/maven/main/project.version-3.9.1 Bump project.version from 3.9.0 to 3.9.1 --- appserver/tests/payara-samples/pom.xml | 2 +- .../repackaged/smallrye-config-repackaged/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index 2188486da03..de813bbbd5d 100644 --- a/appserver/tests/payara-samples/pom.xml +++ b/appserver/tests/payara-samples/pom.xml @@ -347,7 +347,7 @@ io.smallrye.config smallrye-config-repackaged - 3.9.0 + 3.9.1 jakartaee9 test diff --git a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml index 297297e55cb..43a04258ce7 100644 --- a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml @@ -47,7 +47,7 @@ io.smallrye.config smallrye-config-repackaged - 3.9.0 + 3.9.1 Payara Samples - Payara - smallrye-config repackaged as a module From 5028ed8790cbc991a627d440dee546ca769685f4 Mon Sep 17 00:00:00 2001 From: Rhys Williams <170514543+Viii3@users.noreply.github.com> Date: Thu, 15 Aug 2024 09:30:45 +0100 Subject: [PATCH 05/49] Merge pull request #6871 from Viii3/FISH-9176-Spotbugs FISH-9176 FISH-9193 FISH-9194 FISH-9195 Improvements from Spotbugs --- .../extras/rest/PayaraRestApiHandlers.java | 9 +++++---- .../admin/rest/readers/InputObject.java | 4 ++-- .../recorder/AsadminRecorderService.java | 20 +++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java b/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java index 3ba9ea96d98..6afcda7ddf0 100644 --- a/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java +++ b/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU @@ -164,13 +164,14 @@ public static void sendAsadminCommandToSelectedInstances(HandlerContext handlerC command = splitCommand[0]; // Convert the parameters into a space-separated string - String parameters = ""; + String parameters; + StringBuilder paramBuilder = new StringBuilder(); for (int i = 1; i < splitCommand.length; i++) { - parameters += splitCommand[i] + " "; + paramBuilder.append(splitCommand[i]).append(" "); } // Remove any trailing spaces - parameters = parameters.trim(); + parameters = paramBuilder.toString().trim(); // Get the parameters from each row, and send the asadmin command for (Map row : selectedRows) { diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java index 1d6b13cf98b..e8bc6cdb9ef 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java @@ -37,7 +37,7 @@ * only if the new code is made subject to such option by the copyright * holder. */ -// Portions Copyright [2019] Payara Foundation and/or affiliates +// Portions Copyright [2024] Payara Foundation and/or affiliates package org.glassfish.admin.rest.readers; @@ -112,7 +112,7 @@ public double getDouble(String key) throws InputException { try { return o instanceof Number ? ((Number)o).doubleValue() : - Double.valueOf((String) o); + Double.parseDouble((String) o); } catch (Exception e) { throw new InputException("InputObject[" + quote(key) + "] is not a number."); diff --git a/nucleus/payara-modules/asadmin-recorder/src/main/java/fish/payara/asadmin/recorder/AsadminRecorderService.java b/nucleus/payara-modules/asadmin-recorder/src/main/java/fish/payara/asadmin/recorder/AsadminRecorderService.java index 35e59a57e49..421afa66672 100644 --- a/nucleus/payara-modules/asadmin-recorder/src/main/java/fish/payara/asadmin/recorder/AsadminRecorderService.java +++ b/nucleus/payara-modules/asadmin-recorder/src/main/java/fish/payara/asadmin/recorder/AsadminRecorderService.java @@ -1,6 +1,6 @@ /* * - * Copyright (c) 2016-2021 Payara Foundation and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2024 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 @@ -107,12 +107,12 @@ public void event(Event event) { private String constructAsadminCommand(String commandName, ParameterMap parameters) { - String asadminCommand = commandName; - String mandatoryOption = ""; + StringBuilder asadminCommand = new StringBuilder(commandName); + StringBuilder mandatoryOption = new StringBuilder(); if (Boolean.parseBoolean(asadminRecorderConfiguration.prependEnabled()) && prependedOptions != null) { for (String s : prependedOptions) { - asadminCommand += " " + s; + asadminCommand.append(" ").append(s); } } @@ -123,21 +123,21 @@ private String constructAsadminCommand(String commandName, ParameterMap paramete // This can have sub-parameters, so loop through and add spaces // between the sub-parameters. for (int i = 0; i < parameter.getValue().size(); i++) { - mandatoryOption += parameter.getValue().get(i); + mandatoryOption.append(parameter.getValue().get(i)); if (i != (parameter.getValue().size() - 1)) { - mandatoryOption += " "; + mandatoryOption.append(" "); } } } else { - asadminCommand += " --" + parameter.getKey() + "=" + parameter.getValue().get(0); + asadminCommand.append(" --").append(parameter.getKey()).append("=").append(parameter.getValue().get(0)); } } } - asadminCommand += " " + mandatoryOption; - asadminCommand += "\n"; + asadminCommand.append(" ").append(mandatoryOption); + asadminCommand.append("\n"); - return asadminCommand; + return asadminCommand.toString(); } /** From 7ed70cee288ad98f204abeac0190304f551a4922 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 16 Aug 2024 11:22:38 +0100 Subject: [PATCH 06/49] Merge pull request #6893 from payara/dependabot/maven/main/org.apache.maven.plugins-maven-javadoc-plugin-3.8.0 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.7.0 to 3.8.0 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index c2d1284ea44..8291ac02a1c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -175,7 +175,7 @@ 3.2.4 3.1.2 3.2.1 - 3.7.0 + 3.8.0 3.1.2 5.1.9 3.3.1 From bb72cede14d5ebc344fa04700ec0d15294406e7c Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 16 Aug 2024 11:40:28 +0100 Subject: [PATCH 07/49] Merge pull request #6891 from payara/dependabot/maven/main/commons-codec-commons-codec-1.17.1 Bump commons-codec:commons-codec from 1.3 to 1.17.1 --- appserver/tests/quicklook/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml index 7defb033f2b..b22475ef4c8 100644 --- a/appserver/tests/quicklook/pom.xml +++ b/appserver/tests/quicklook/pom.xml @@ -205,7 +205,7 @@ commons-codec commons-codec - 1.3 + 1.17.1 org.testng From 94c2d9d31a02bb86d9cca9d528a431ffdb85a6eb Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 16 Aug 2024 11:43:10 +0100 Subject: [PATCH 08/49] Merge pull request #6890 from payara/dependabot/maven/main/org.slf4j-slf4j-simple-2.0.16 Bump org.slf4j:slf4j-simple from 2.0.13 to 2.0.16 --- appserver/tests/payara-samples/samples/reproducers/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/samples/reproducers/pom.xml b/appserver/tests/payara-samples/samples/reproducers/pom.xml index 8f19aa04b40..be377b39bfd 100644 --- a/appserver/tests/payara-samples/samples/reproducers/pom.xml +++ b/appserver/tests/payara-samples/samples/reproducers/pom.xml @@ -90,7 +90,7 @@ org.slf4j slf4j-simple - 2.0.13 + 2.0.16 org.jboss.shrinkwrap.resolver From e5d74ab3eb37764fbd51a9c627155ae2a6e668d4 Mon Sep 17 00:00:00 2001 From: Luis Eufrasio Teixeira Neto Date: Fri, 16 Aug 2024 10:53:01 -0300 Subject: [PATCH 09/49] Merge pull request #6889 from luiseufrasio/FISH-9112-rest-link-redirection-host-in-header FISH-9112 : setting local Name and Port for /managment/domain URI --- .../admin/rest/adapter/RestManagementAdapter.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestManagementAdapter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestManagementAdapter.java index 7ad2ad0b9e2..98cfb581fca 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestManagementAdapter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestManagementAdapter.java @@ -37,8 +37,12 @@ * only if the new code is made subject to such option by the copyright * holder. */ +// Portions Copyright [2024] Payara Foundation and/or affiliates + package org.glassfish.admin.rest.adapter; +import org.glassfish.grizzly.http.server.Request; +import org.glassfish.grizzly.http.server.Response; import org.jvnet.hk2.annotations.Service; import org.glassfish.admin.restconnector.Constants; @@ -55,4 +59,11 @@ public RestManagementAdapter() { setRestResourceProvider(new RestManagementResourceProvider()); } + @Override + public void service(Request req, Response res) { + req.setServerName(req.getLocalName()); + req.setServerPort(req.getLocalPort()); + super.service(req, res); + } + } From e1f837b554b178ce45e82fd836c5e5359be56ad8 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Wed, 21 Aug 2024 11:09:10 +0100 Subject: [PATCH 10/49] Merge pull request #6848 from flowlogix/failed-deployment-cleanup FISH-9171 bugfix: prevent deployment failures from causing an undeployment failure and leaks --- .../apache/catalina/core/StandardContext.java | 30 ++++++++++++++++--- .../com/sun/enterprise/web/WebContainer.java | 7 +++-- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java index a84ece1ec7a..42758ba328c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java @@ -2303,9 +2303,9 @@ protected void addChild(Container child, boolean isProgrammatic, Wrapper oldJspServlet = null; // Allow webapp to override JspServlet inherited from global web.xml. - boolean isJspServlet = "jsp".equals(wrapperName); + boolean isJspServlet = Constants.JSP_SERVLET_NAME.equals(wrapperName); if (isJspServlet) { - oldJspServlet = (Wrapper) findChild("jsp"); + oldJspServlet = (Wrapper) findChild(Constants.JSP_SERVLET_NAME); if (oldJspServlet != null) { removeChild(oldJspServlet); } @@ -3238,7 +3238,7 @@ public void addInstanceListener(InstanceListener listener) { public void addJspMapping(String pattern) { String servletName = findServletMapping("*.jsp"); if (servletName == null) { - servletName = "jsp"; + servletName = Constants.JSP_SERVLET_NAME; } if( findChild(servletName) != null) { @@ -5766,6 +5766,8 @@ public synchronized void start() throws LifecycleException { } catch (Throwable t) { log.log(Level.SEVERE, LogFacade.STARTUP_CONTEXT_FAILED_EXCEPTION, getName()); try { + // ensure that all JSP resources are released in stop() method below + forceLoadJspServlet(); stop(); } catch (Throwable tt) { log.log(Level.SEVERE, LogFacade.CLEANUP_FAILED_EXCEPTION, tt); @@ -5951,7 +5953,11 @@ public synchronized void stop(boolean isShutdown) if ((manager != null) && (manager instanceof Lifecycle)) { if(manager instanceof StandardManager) { - ((StandardManager)manager).stop(isShutdown); + try { + ((StandardManager)manager).stop(isShutdown); + } catch (LifecycleException e) { + log.log(Level.INFO, e.getMessage()); + } } else { ((Lifecycle)manager).stop(); } @@ -8132,4 +8138,20 @@ private File getExtractedMetaInfResourcePath(String path) { } return null; } + + + /** + * Force loading of the JSP servlet. This is needed in case of + * initialization failure, so the JSP servlet would be unloaded properly + * and release all of its resources + * + * @throws ServletException + */ + private void forceLoadJspServlet() throws ServletException { + Container jspServlet = findChild(Constants.JSP_SERVLET_NAME); + if (jspServlet instanceof Wrapper) { + Wrapper jspServletWrapper = (Wrapper) jspServlet; + jspServletWrapper.load(); + } + } } diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java index cc27e187be2..36d3dc4587c 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java @@ -37,7 +37,7 @@ * only if the new code is made subject to such option by the copyright * holder. */ -// Portions Copyright [2016-2022] [Payara Foundation and/or its affiliates] +// Portions Copyright [2016-2024] [Payara Foundation and/or its affiliates] package com.sun.enterprise.web; @@ -232,6 +232,9 @@ public class WebContainer implements org.glassfish.api.container.Container, Post @Inject private LoggingRuntime loggingRuntime; + @Inject + private Deployment deployment; + private final Map connectorMap = new HashMap<>(); private EmbeddedWebContainer _embedded; @@ -2058,7 +2061,7 @@ public void unloadWebModule(String contextRoot, String appName, String virtualSe } } - if (!hasBeenUndeployed) { + if (!hasBeenUndeployed && deployment.getCurrentDeploymentContext() == null) { logger.log(Level.SEVERE, LogFacade.UNDEPLOY_ERROR, contextRoot); } } From f8371bbbbea73ed518da817a4c577886524aef2d Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 23 Aug 2024 09:38:06 +0100 Subject: [PATCH 11/49] Merge pull request #6896 from payara/dependabot/maven/main/org.eclipse-yasson-3.0.4 FISH-9483 Bump org.eclipse:yasson from 3.0.3 to 3.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cad7585db1d..6ae89e0dbbf 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 4.0.0.payara-p2 2.3.0 - 3.0.3 + 3.0.4 5.0.0-B02 9.7.0 6.3.0.payara-p3 From 782b03fe011b45b0aa4ca0751b5d9c5cf5fe555d Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 23 Aug 2024 09:43:13 +0100 Subject: [PATCH 12/49] Merge pull request #6898 from payara/dependabot/maven/main/io.projectreactor-reactor-core-3.6.9 Bump io.projectreactor:reactor-core from 3.6.8 to 3.6.9 --- appserver/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/pom.xml b/appserver/pom.xml index ee1ac4a36ca..5f0c1fc6db3 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -85,7 +85,7 @@ 9.40 2.5.1 2.5.1 - 3.6.8 + 3.6.9 1.0.4 1.0-1 From c919240713d0cb714c3d305e0ac5479ea7a736fb Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 23 Aug 2024 09:48:47 +0100 Subject: [PATCH 13/49] Merge pull request #6900 from payara/dependabot/maven/main/shrinkwrap.version-3.3.1 Bump shrinkwrap.version from 3.3.0 to 3.3.1 --- appserver/tests/payara-samples/samples/concurrency/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/samples/concurrency/pom.xml b/appserver/tests/payara-samples/samples/concurrency/pom.xml index 33142f6253e..344e17fee6b 100644 --- a/appserver/tests/payara-samples/samples/concurrency/pom.xml +++ b/appserver/tests/payara-samples/samples/concurrency/pom.xml @@ -61,7 +61,7 @@ 5.10.3 3.0.alpha4 3.0.3 - 3.3.0 + 3.3.1 From e9ba21ffeeee1cd517809980ab007808ef482019 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 23 Aug 2024 09:51:59 +0100 Subject: [PATCH 14/49] Merge pull request #6904 from payara/dependabot/maven/main/org.apache.maven.plugins-maven-invoker-plugin-3.8.0 Bump org.apache.maven.plugins:maven-invoker-plugin from 3.6.1 to 3.8.0 --- nucleus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nucleus/pom.xml b/nucleus/pom.xml index e841009c2a3..b5905784617 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -88,7 +88,7 @@ ${build.number} 2.10 - 3.6.1 + 3.8.0 3.4.0 0.6.2 0.15.3 From 30349d30514069be9fd048e717a49dec794f316c Mon Sep 17 00:00:00 2001 From: Alfonso Valdez Date: Sat, 24 Aug 2024 11:35:14 -0600 Subject: [PATCH 15/49] Merge pull request #6880 from flowlogix/monitoring-shutdown-exception FISH-9222 bugfix: disable PayaraExecutorService events before server shuts down --- .../PayaraExecutorService.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/nucleus/payara-modules/payara-executor-service/src/main/java/fish/payara/nucleus/executorservice/PayaraExecutorService.java b/nucleus/payara-modules/payara-executor-service/src/main/java/fish/payara/nucleus/executorservice/PayaraExecutorService.java index 79c5bd48971..92c3be3069c 100644 --- a/nucleus/payara-modules/payara-executor-service/src/main/java/fish/payara/nucleus/executorservice/PayaraExecutorService.java +++ b/nucleus/payara-modules/payara-executor-service/src/main/java/fish/payara/nucleus/executorservice/PayaraExecutorService.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) [2017-2022] Payara Foundation and/or its affiliates. All rights reserved. + * Copyright (c) [2017-2024] 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 @@ -137,8 +137,10 @@ public void event(Event event) { if (null == threadPoolExecutor) { initialiseThreadPools(); } - } else if (event.is(EventTypes.SERVER_SHUTDOWN)) { + } else if (event.is(EventTypes.PREPARE_SHUTDOWN)) { terminateThreadPools(); + } else if (event.is(EventTypes.SERVER_SHUTDOWN)) { + awaitTerminationOfThreadPools(); } } @@ -149,7 +151,13 @@ private void terminateThreadPools() { } threadPoolExecutor.shutdown(); scheduledThreadPoolExecutor.shutdown(); + } + private void awaitTerminationOfThreadPools() { + if (threadPoolExecutor == null) { + // we didn't initialize yet + return; + } // Wait until the schedulers actually terminate try { threadPoolExecutor.awaitTermination(5, TimeUnit.SECONDS); @@ -189,9 +197,6 @@ private void initialiseThreadPools() { Logger.getLogger(PayaraExecutorService.class.getName()).log(SEVERE, "Uncaught exception in Payara Scheduled Executor thread ", thrwbl)); return t; }); - scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true); - - } else { int threadPoolExecutorQueueSize = Integer.valueOf(payaraExecutorServiceConfiguration.getThreadPoolExecutorQueueSize()); @@ -224,9 +229,9 @@ public void uncaughtException(Thread thread, Throwable thrwbl) { }); return t; }); - scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true); } - + scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true); + scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); } public Future submit(Callable task) { From b145ad6e6f0da8656fe6b5ed50ee10a1a7eb8848 Mon Sep 17 00:00:00 2001 From: Kalin Chan <73829904+kalinchan@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:43:22 +0100 Subject: [PATCH 16/49] Merge pull request #6902 from kalinchan/FISH-6579 FISH-6579 Hide ssl tab when security is disabled --- .../src/main/resources/configuration/httpListenerTabs.inc | 6 +++++- .../web/src/main/resources/grizzly/listenerTabs.inc | 6 +++++- .../web/src/main/resources/grizzly/protocolTabs.inc | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc b/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc index bac61847017..b9eaecef73a 100644 --- a/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc +++ b/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc @@ -39,6 +39,7 @@ holder. --> + @@ -47,7 +48,10 @@ gf.redirect(page="#{request.contextPath}/web/configuration/httpListenerEdit.jsf?configName=#{configName}&name=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}"); /> - + + + @@ -49,7 +50,10 @@ gf.redirect(page="#{request.contextPath}/web/grizzly/networkListenerEdit.jsf?configName=#{configName}&name=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}"); /> - + + + @@ -49,7 +50,10 @@ gf.redirect(page="#{request.contextPath}/web/grizzly/protocolEdit.jsf?configName=#{configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}"); /> - + + Date: Wed, 28 Aug 2024 12:50:34 -0300 Subject: [PATCH 17/49] Merge pull request #6913 from luiseufrasio/FISH-9186-doc-root-not-working-on-dfsn-win-server-19-p6 FISH-9186 : Use the LinkOption.NOFOLLOW_LINKS option --- .../main/java/org/apache/naming/resources/FileDirContext.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java index 85201de234d..f616e5123bd 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java @@ -59,6 +59,7 @@ package org.apache.naming.resources; +import java.nio.file.LinkOption; import java.text.MessageFormat; import java.util.*; import java.util.logging.Logger; @@ -927,7 +928,7 @@ private File validate(File baseFile, String name, String keyName, Map Date: Thu, 29 Aug 2024 09:53:49 +0100 Subject: [PATCH 18/49] Merge pull request #6906 from Viii3/FISH-9197-Logging FISH-9197 Masking --- .../glassfish/admingui/common/util/RestUtil.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java index 4d5a270076d..1a2e143cba2 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java @@ -37,7 +37,7 @@ * only if the new code is made subject to such option by the copyright * holder. */ -// Portions Copyright [2017-2021] [Payara Foundation and/or its affiliates] +// Portions Copyright [2017-2024] [Payara Foundation and/or its affiliates] package org.glassfish.admingui.common.util; @@ -190,12 +190,12 @@ public static Map restRequest(String endpoint, Map maskedAttr = maskOffPassword(attrs); - logger.log(Level.FINEST, - GuiUtil.getCommonMessage("LOG_REST_REQUEST_INFO", - new Object[]{ - endpoint, - (useData && "post".equals(method)) ? data : attrs, method - })); + logger.log(Level.FINEST, GuiUtil.getCommonMessage("LOG_REST_REQUEST_INFO", + new Object[]{ + endpoint, + (useData && "post".equals(method)) ? data : maskedAttr, method + }) + ); } // Execute the request... From c4f4cb44924fb71833e44bad6a5e6a4b892e5933 Mon Sep 17 00:00:00 2001 From: Rhys Williams <170514543+Viii3@users.noreply.github.com> Date: Thu, 29 Aug 2024 09:54:56 +0100 Subject: [PATCH 19/49] Merge pull request #6903 from Viii3/FISH-9456-Community6 FISH-9456 Resource Bundles --- .../main/java/com/sun/logging/LogDomains.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java index 3b881122faf..6dab0489ded 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java +++ b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java @@ -78,6 +78,8 @@ private LogDomains() {} */ public static final String RESOURCE_BUNDLE = "LogStrings"; + public static final String RESOURCE_BUNDLE_MESSAGES = "LogMessages"; + /** * Field */ @@ -363,26 +365,33 @@ public static Logger getLogger(final Class clazz, final String namePrefix, final return logManager.getLogger(cLogger.getName()); } - private static ResourceBundle getResourceBundle(final String name, final Class clazz, - final ClassLoader resourceBundleLoader) { - final ResourceBundle classBundle = findResourceBundle(name, clazz, resourceBundleLoader); + private static ResourceBundle getResourceBundle (final String name, final Class clazz, final ClassLoader resourceBundleLoader) { + ResourceBundle classBundle = findResourceBundle(name, clazz, resourceBundleLoader); + if (classBundle == null) { // EJB uses LogMessages instead of LogStrings, check for this file if necessary. + classBundle = findResourceBundle(name, clazz, resourceBundleLoader, RESOURCE_BUNDLE_MESSAGES); + } + if (classBundle != null) { return classBundle; } + Logger.getAnonymousLogger().log(Level.INFO, "Cannot find the resource bundle for the name {0} for {1} using {2}", new Object[]{name, clazz, resourceBundleLoader}); return null; } - private static ResourceBundle findResourceBundle(final String name, final Class clazz, - final ClassLoader classLoader) { - final ResourceBundle packageRootBundle = tryTofindResourceBundle(name, classLoader); + private static ResourceBundle findResourceBundle (final String name, final Class clazz, final ClassLoader classLoader) { + return findResourceBundle(name, clazz, classLoader, LogDomains.RESOURCE_BUNDLE); + } + + private static ResourceBundle findResourceBundle (final String name, final Class clazz, final ClassLoader classLoader, final String fileSuffix) { + final ResourceBundle packageRootBundle = tryToFindResourceBundle(name, classLoader, fileSuffix); if (packageRootBundle != null) { return packageRootBundle; } // not found. Ok, let's try to go through the class's package tree final StringBuilder rbPackage = new StringBuilder(clazz.getPackage().getName()); while (true) { - final ResourceBundle subPkgBundle = tryTofindResourceBundle(rbPackage.toString(), classLoader); + final ResourceBundle subPkgBundle = tryToFindResourceBundle(rbPackage.toString(), classLoader, fileSuffix); if (subPkgBundle != null) { return subPkgBundle; } @@ -402,9 +411,9 @@ private static String getLoggerName(Class clazz, String logDomainsConstantName) return loggerName; } - private static ResourceBundle tryTofindResourceBundle(final String name, final ClassLoader classLoader) { + private static ResourceBundle tryToFindResourceBundle (final String name, final ClassLoader classLoader, final String fileSuffix) { try { - return ResourceBundle.getBundle(name + "." + LogDomains.RESOURCE_BUNDLE, Locale.getDefault(), classLoader); + return ResourceBundle.getBundle(name + "." + fileSuffix, Locale.getDefault(), classLoader); } catch (MissingResourceException e) { return null; } From a5cb240fe29acb7306b9c97850514a56fc14c927 Mon Sep 17 00:00:00 2001 From: Rhys Williams <170514543+Viii3@users.noreply.github.com> Date: Thu, 29 Aug 2024 10:24:26 +0100 Subject: [PATCH 20/49] Merge pull request #6905 from Viii3/FISH-8142-Update-Mojarra FISH-8142 Update Mojarra --- .../faces/integration/GlassFishInjectionProvider.java | 9 +++++---- pom.xml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishInjectionProvider.java b/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishInjectionProvider.java index 6e5922e63de..ac26fd7f7b4 100644 --- a/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishInjectionProvider.java +++ b/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishInjectionProvider.java @@ -37,13 +37,14 @@ * only if the new code is made subject to such option by the copyright * holder. */ +// Portions Copyright 2024 Payara Foundation and/or its affiliates package org.glassfish.faces.integration; import static com.sun.enterprise.web.Constants.DEPLOYMENT_CONTEXT_ATTRIBUTE; import static com.sun.enterprise.web.Constants.ENABLE_HA_ATTRIBUTE; import static com.sun.enterprise.web.Constants.IS_DISTRIBUTABLE_ATTRIBUTE; -import static com.sun.faces.config.WebConfiguration.BooleanWebContextInitParameter.EnableAgressiveSessionDirtying; +import static com.sun.faces.config.WebConfiguration.BooleanWebContextInitParameter.EnableDistributable; import static java.lang.Boolean.TRUE; import static java.security.AccessController.doPrivileged; import static java.util.logging.Level.FINE; @@ -460,7 +461,7 @@ public void enableHighAvailability(ServletContext ctx) { // 2> Was deployed with --availabilityenabled --target WebConfiguration config = WebConfiguration.getInstance(ctx); - if (!config.isSet(EnableAgressiveSessionDirtying)) { + if (!config.isSet(EnableDistributable)) { Object isDistributableObj = ctx.getAttribute(IS_DISTRIBUTABLE_ATTRIBUTE); Object enableHAObj = ctx.getAttribute(ENABLE_HA_ATTRIBUTE); @@ -473,8 +474,8 @@ public void enableHighAvailability(ServletContext ctx) { } if (isDistributable && enableHA) { - LOGGER.fine("setting the EnableAgressiveSessionDirtying to true"); - config.overrideContextInitParameter(EnableAgressiveSessionDirtying, TRUE); + LOGGER.fine("setting EnableDistributable to true"); + config.overrideContextInitParameter(EnableDistributable, TRUE); } } } diff --git a/pom.xml b/pom.xml index 6ae89e0dbbf..627b95b56a7 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ 1.0.3 2.2 - 4.0.0.payara-p2 + 4.0.7.payara-p1 2.3.0 3.0.4 From 4e853b0d5a59dd8da0d69897aaa7fffb4e9afafb Mon Sep 17 00:00:00 2001 From: Alfonso Valdez Date: Thu, 29 Aug 2024 11:14:26 -0600 Subject: [PATCH 21/49] Merge pull request #6901 from breakponchito/FISH-9502-fix-untargeted-app-deployment-instance FISH-9502: adding validation to skip deploy on target --- .../v3/server/ApplicationLifecycle.java | 2 +- .../v3/server/ApplicationLoaderService.java | 28 +++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java index 22b7005d698..ceeed0c4b69 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java @@ -649,7 +649,7 @@ public void initialize(ApplicationInfo appInfo, Collection sn currentDeploymentContext.get().pop(); } } - + @Override public ApplicationInfo deploy(final ExtendedDeploymentContext context) { return deploy(null, context); diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java index d4fd077e2d5..ef9d0bef519 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java @@ -46,6 +46,7 @@ import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.admin.report.HTMLActionReporter; import com.sun.enterprise.v3.bootstrap.BootCommandService; +import fish.payara.enterprise.config.serverbeans.DeploymentGroup; import java.io.File; import java.io.IOException; import java.net.URI; @@ -408,7 +409,7 @@ public List processApplication(Application app DeployCommandParameters deploymentParams = app.getDeployParameters(appRef); - deploymentParams.target = server.getName(); + deploymentParams.target = validateAndGetTargetName(appName, server.getName()); deploymentParams.origin = DeployCommandParameters.Origin.load; deploymentParams.command = DeployCommandParameters.Command.startup_server; if (domain.isAppReferencedByPaaSTarget(appName)) { @@ -462,6 +463,29 @@ public List processApplication(Application app return appDeployments; } + /** + * Evaluate Target name against Deployment groups and returns correct name for deployment process + * @param appName application name + * @param serverName specified server name to evaluate + * @return String that represents target name + */ + public String validateAndGetTargetName(String appName, String serverName) { + List targets = domain.getAllReferencedTargetsForApplication(appName); + if (targets.isEmpty()) { + return serverName; + } + + String targetName = targets.get(0); + java.util.Optional optDG = domain.getDeploymentGroups().getDeploymentGroup(). + stream().filter(d -> d.getName().equals(targetName)).findAny(); + + if (optDG.isPresent()) { + return optDG.get().getName(); + } + + return targetName; + } + public String toString() { return "Application Loader"; @@ -636,4 +660,4 @@ private boolean loadAppOnDAS(String appName) { } return false; } -} +} \ No newline at end of file From d09abe7eb5ea7a0383db1902490905a50eff52bd Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 2 Sep 2024 09:39:48 +0100 Subject: [PATCH 22/49] Merge pull request #6909 from payara/dependabot/maven/main/org.jboss.shrinkwrap.resolver-shrinkwrap-resolver-impl-maven-archive-3.3.1 Bump org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive from 3.3.0 to 3.3.1 --- appserver/extras/docker-images/tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/extras/docker-images/tests/pom.xml b/appserver/extras/docker-images/tests/pom.xml index bfd3bfe4fdf..96104f1b140 100644 --- a/appserver/extras/docker-images/tests/pom.xml +++ b/appserver/extras/docker-images/tests/pom.xml @@ -109,7 +109,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven-archive - 3.3.0 + 3.3.1 test From 6dad18807b14f62263b76e557e447e507fd239e1 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 2 Sep 2024 09:42:52 +0100 Subject: [PATCH 23/49] Merge pull request #6907 from payara/dependabot/maven/main/org.jetbrains.kotlin-kotlin-stdlib-2.0.20 Bump org.jetbrains.kotlin:kotlin-stdlib from 2.0.0 to 2.0.20 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 8291ac02a1c..f493f647108 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -122,7 +122,7 @@ 1.0-2 1.0 4.12.0 - 2.0.0 + 2.0.20 3.2.3.payara-p1 From 3f83f919bd05675568c32a02dbd6193813ffa819 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 2 Sep 2024 09:44:11 +0100 Subject: [PATCH 24/49] Merge pull request #6908 from payara/dependabot/maven/main/org.apache.maven.plugins-maven-site-plugin-3.20.0 Bump org.apache.maven.plugins:maven-site-plugin from 3.12.1 to 3.20.0 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index f493f647108..ee23d9bb62a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -179,7 +179,7 @@ 3.1.2 5.1.9 3.3.1 - 3.12.1 + 3.20.0 3.2.20.payara-p2 3.1.0 3.7.1 From 8784dc13ee33794d335f5feb6b96fb2859b6f6d0 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 2 Sep 2024 09:45:31 +0100 Subject: [PATCH 25/49] Merge pull request #6910 from payara/dependabot/maven/main/org.jboss.shrinkwrap.resolver-shrinkwrap-resolver-bom-3.3.1 Bump org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-bom from 3.3.0 to 3.3.1 --- appserver/tests/payara-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index de813bbbd5d..3bc668ed811 100644 --- a/appserver/tests/payara-samples/pom.xml +++ b/appserver/tests/payara-samples/pom.xml @@ -307,7 +307,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-bom - 3.3.0 + 3.3.1 pom import From e646f14630724fabdb427eb4ae05b605f34b784a Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 2 Sep 2024 09:47:14 +0100 Subject: [PATCH 26/49] Merge pull request #6911 from payara/dependabot/maven/main/org.apache.felix-org.apache.felix.webconsole-5.0.6 Bump org.apache.felix:org.apache.felix.webconsole from 5.0.2 to 5.0.6 --- nucleus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nucleus/pom.xml b/nucleus/pom.xml index b5905784617..0f5d0bfbffd 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -115,7 +115,7 @@ 7.0.5 - 5.0.2 + 5.0.6 1.6.4 1.4.3 1.1.6 From a75182b3925b70aee4869789e9f71ff46189e04e Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Tue, 3 Sep 2024 09:03:16 +0100 Subject: [PATCH 27/49] Merge pull request #6917 from Pandrex247/FISH-9580 FISH-9579 Upgrade Docker JDKs --- appserver/extras/docker-images/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/extras/docker-images/pom.xml b/appserver/extras/docker-images/pom.xml index 5ce8d9a2803..312af6b21f3 100644 --- a/appserver/extras/docker-images/pom.xml +++ b/appserver/extras/docker-images/pom.xml @@ -57,7 +57,7 @@ true azul/zulu-openjdk - 21.0.3-jdk + 21.0.4-jdk 2.0.0 From 7a176e04dc76b3b8186e33cdb66934877a1392cc Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 5 Sep 2024 17:27:00 +0100 Subject: [PATCH 29/49] Merge pull request #6921 from payara/dependabot/maven/main/org.apache.ant-ant-apache-regexp-1.10.15 Bump org.apache.ant:ant-apache-regexp from 1.10.14 to 1.10.15 --- appserver/tests/quicklook/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml index b22475ef4c8..3fa4a830678 100644 --- a/appserver/tests/quicklook/pom.xml +++ b/appserver/tests/quicklook/pom.xml @@ -236,7 +236,7 @@ org.apache.ant ant-apache-regexp - 1.10.14 + 1.10.15 runtime From cfe8e5c296b9fe4985d5d37661782e2f50d07d8c Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 5 Sep 2024 17:28:40 +0100 Subject: [PATCH 30/49] Merge pull request #6922 from payara/dependabot/maven/main/org.apache.ant-ant-junit-1.10.15 Bump org.apache.ant:ant-junit from 1.10.14 to 1.10.15 --- appserver/tests/quicklook/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml index 3fa4a830678..2c203d120c8 100644 --- a/appserver/tests/quicklook/pom.xml +++ b/appserver/tests/quicklook/pom.xml @@ -231,7 +231,7 @@ org.apache.ant ant-junit - 1.10.14 + 1.10.15 org.apache.ant From d4f7d03cc8496ac12aa05a1d9d9ca82b8cf4a5a5 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 5 Sep 2024 17:30:13 +0100 Subject: [PATCH 31/49] Merge pull request #6923 from payara/dependabot/maven/main/org.hamcrest-hamcrest-3.0 Bump org.hamcrest:hamcrest from 2.2 to 3.0 --- nucleus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nucleus/pom.xml b/nucleus/pom.xml index 093f1473921..cba75dfc86c 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -785,7 +785,7 @@ Parent is ${project.parent} org.hamcrest hamcrest - 2.2 + 3.0 test From 061800ac26bd4312c952401e970b0aa0516655aa Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 5 Sep 2024 17:32:54 +0100 Subject: [PATCH 32/49] Merge pull request #6924 from payara/dependabot/maven/main/io.smallrye.common-smallrye-common-expression-2.6.0 Bump io.smallrye.common:smallrye-common-expression from 2.5.0 to 2.6.0 --- .../repackaged/smallrye-config-repackaged/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml index 43a04258ce7..08814d551fe 100644 --- a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml @@ -146,7 +146,7 @@ io.smallrye.common smallrye-common-expression - 2.5.0 + 2.6.0 true From 63c975e76830bd1615e4309b29cc3dc40b082951 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 6 Sep 2024 09:20:55 +0100 Subject: [PATCH 33/49] Merge pull request #6930 from payara/dependabot/maven/main/org.yaml-snakeyaml-2.3 Bump org.yaml:snakeyaml from 2.2 to 2.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 627b95b56a7..2cfce22f517 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ 1.0.3 - 2.2 + 2.3 4.0.7.payara-p1 2.3.0 From 09229d5f46e50c978fd6c0b00056cc202df4defc Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 6 Sep 2024 09:22:37 +0100 Subject: [PATCH 34/49] Merge pull request #6929 from payara/dependabot/maven/main/org.apache.maven.plugins-maven-failsafe-plugin-3.5.0 Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.1 to 3.5.0 --- appserver/tests/fish372-tests/datagrid-tests/pom.xml | 2 +- core/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appserver/tests/fish372-tests/datagrid-tests/pom.xml b/appserver/tests/fish372-tests/datagrid-tests/pom.xml index 187d8addcff..1b8806a50ae 100644 --- a/appserver/tests/fish372-tests/datagrid-tests/pom.xml +++ b/appserver/tests/fish372-tests/datagrid-tests/pom.xml @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.3.1 + 3.5.0 integration-test diff --git a/core/pom.xml b/core/pom.xml index ee23d9bb62a..ef9a0daa14b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -178,7 +178,7 @@ 3.8.0 3.1.2 5.1.9 - 3.3.1 + 3.5.0 3.20.0 3.2.20.payara-p2 3.1.0 From b48f5c6d1b67dca44d0dacb9c6da7470a5572cfc Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 6 Sep 2024 09:23:59 +0100 Subject: [PATCH 35/49] Merge pull request #6927 from payara/dependabot/maven/main/org.easymock-easymock-5.4.0 Bump org.easymock:easymock from 5.3.0 to 5.4.0 --- appserver/concurrent/concurrent-impl/pom.xml | 2 +- appserver/jdbc/jdbc-config/pom.xml | 2 +- appserver/web/weld-integration/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml index ab09c80149e..8b5deb91b39 100644 --- a/appserver/concurrent/concurrent-impl/pom.xml +++ b/appserver/concurrent/concurrent-impl/pom.xml @@ -114,7 +114,7 @@ org.easymock easymock - 5.3.0 + 5.4.0 test diff --git a/appserver/jdbc/jdbc-config/pom.xml b/appserver/jdbc/jdbc-config/pom.xml index 60798b3856c..fb79830a78c 100644 --- a/appserver/jdbc/jdbc-config/pom.xml +++ b/appserver/jdbc/jdbc-config/pom.xml @@ -77,7 +77,7 @@ org.easymock easymock - 5.3.0 + 5.4.0 test diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml index 9b29bc79dfd..c463bdd689c 100644 --- a/appserver/web/weld-integration/pom.xml +++ b/appserver/web/weld-integration/pom.xml @@ -201,7 +201,7 @@ org.easymock easymock - 5.3.0 + 5.4.0 test From e59d006fc501913bd1802518c31db88f1a87fbdc Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 6 Sep 2024 09:24:09 +0100 Subject: [PATCH 36/49] Merge pull request #6926 from payara/dependabot/maven/main/org.apache.maven.plugins-maven-javadoc-plugin-3.10.0 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.8.0 to 3.10.0 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index ef9a0daa14b..874ab5b4893 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -175,7 +175,7 @@ 3.2.4 3.1.2 3.2.1 - 3.8.0 + 3.10.0 3.1.2 5.1.9 3.5.0 From 1c990ed269d74a6e9f99c41302001520b26090bb Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 9 Sep 2024 13:42:58 +0100 Subject: [PATCH 37/49] Merge pull request #6931 from Pandrex247/FISH-9604 FISH-9604 Upgrade Ant to 1.10.15 --- nucleus/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nucleus/pom.xml b/nucleus/pom.xml index cba75dfc86c..8cb1f076bfc 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -137,8 +137,7 @@ nucleus - 1.10.14 - 1.10.14 + 1.10.15 -Xdoclint:none @@ -807,7 +806,7 @@ Parent is ${project.parent} org.apache.ant ant-launcher - ${ant-launcher.version} + ${ant.version} com.sun From 3151197c115d0e9963c1c0c4c2e5195eb06c58fb Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 9 Sep 2024 13:44:56 +0100 Subject: [PATCH 38/49] Merge pull request #6934 from payara/dependabot/maven/main/org.apache.maven.plugins-maven-install-plugin-3.1.3 Bump org.apache.maven.plugins:maven-install-plugin from 3.1.2 to 3.1.3 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 874ab5b4893..32611d93ddf 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -176,7 +176,7 @@ 3.1.2 3.2.1 3.10.0 - 3.1.2 + 3.1.3 5.1.9 3.5.0 3.20.0 From e7ccd80626d77da7074edcf19a607395a0acef55 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 9 Sep 2024 13:45:08 +0100 Subject: [PATCH 39/49] Merge pull request #6936 from payara/dependabot/maven/main/io.smallrye.common-smallrye-common-function-2.6.0 Bump io.smallrye.common:smallrye-common-function from 2.5.0 to 2.6.0 --- .../repackaged/smallrye-config-repackaged/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml index 08814d551fe..2e30662b53d 100644 --- a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml @@ -152,7 +152,7 @@ io.smallrye.common smallrye-common-function - 2.5.0 + 2.6.0 true From 677db69d7bd496dfa11e02d03452ae772401dd82 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 9 Sep 2024 13:45:44 +0100 Subject: [PATCH 40/49] Merge pull request #6932 from payara/dependabot/maven/main/io.smallrye.common-smallrye-common-annotation-2.6.0 Bump io.smallrye.common:smallrye-common-annotation from 2.5.0 to 2.6.0 --- .../repackaged/smallrye-config-repackaged/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml index 2e30662b53d..df8058ac5eb 100644 --- a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml @@ -140,7 +140,7 @@ io.smallrye.common smallrye-common-annotation - 2.5.0 + 2.6.0 true From b22ad0e17d8a571f63520956c9e95f0c362f18a9 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 9 Sep 2024 13:45:55 +0100 Subject: [PATCH 41/49] Merge pull request #6935 from payara/dependabot/maven/main/org.testcontainers-testcontainers-1.20.1 Bump org.testcontainers:testcontainers from 1.19.7 to 1.20.1 --- appserver/extras/docker-images/tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/extras/docker-images/tests/pom.xml b/appserver/extras/docker-images/tests/pom.xml index 96104f1b140..29986487787 100644 --- a/appserver/extras/docker-images/tests/pom.xml +++ b/appserver/extras/docker-images/tests/pom.xml @@ -73,7 +73,7 @@ org.testcontainers testcontainers - 1.19.7 + 1.20.1 test From e873b39a74331b02d214bb911cc7206fa9379d15 Mon Sep 17 00:00:00 2001 From: Kalin Chan <73829904+kalinchan@users.noreply.github.com> Date: Wed, 11 Sep 2024 12:10:37 +0100 Subject: [PATCH 42/49] Merge pull request #6943 from kalinchan/FISH-9553 FISH-9553 Sanitise properties in admin console --- .../admingui/common/handlers/UtilHandlers.java | 14 +++++++++++++- .../resources/configuration/sysInstanceValues.jsf | 6 +++--- .../resources/configuration/systemProperties.jsf | 4 +++- .../src/main/resources/iiopServerPageNode.jsf | 5 ++++- .../web/src/main/resources/serverPageNode.jsf | 5 +++-- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java index aee71ac32ad..a258e4fedd3 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java @@ -37,7 +37,7 @@ * only if the new code is made subject to such option by the copyright * holder. */ -// Portions Copyright 2018-2022 Payara Foundation and/or affiliates +// Portions Copyright 2018-2024 Payara Foundation and/or affiliates /* * UtilHandlers.java @@ -1164,4 +1164,16 @@ public static String escapePropertyValue(String str){ } private static final String PATH_SEPARATOR = "${path.separator}"; + + @Handler(id = "gf.sanitiseProperty", + input = { + @HandlerInput(name = "systemProperty", type = String.class, required = true) + }, + output = { + @HandlerOutput(name = "result", type = String.class) + } + ) + public static void sanitiseProperty(HandlerContext handlerCtx) { + handlerCtx.setOutputValue("result", escapePropertyValue(((String)handlerCtx.getInputValue("systemProperty")))); + } } diff --git a/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf b/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf index b60e08bbd40..e88891fb328 100644 --- a/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf +++ b/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf @@ -38,7 +38,7 @@ only if the new code is made subject to such option by the copyright holder. - Portions Copyright [2020] [Payara Foundation and/or its affiliates] + Portions Copyright [2020-2024] [Payara Foundation and/or its affiliates] --> @@ -59,6 +60,8 @@ listAdd(value="#{pageSession.iiopListenerAttrs.data.extraProperties.entity['port']}" list="#{pageSession.iiopPortsList}"); } gf.resolveTokens(tokens="#{pageSession.iiopPortsList}" endPoint="#{sessionScope.REST_URL}/servers/server/#{pageSession.instanceName}" resolvedTokens="#{pageSession.iiopResolvedPortsList}"); - convertListToCommaString(list="#{pageSession.iiopResolvedPortsList}" commaString="#{pageSession.iiopPorts}"); + convertListToCommaString(list="#{pageSession.iiopResolvedPortsList}" commaString="#{iiopPorts}"); + gf.sanitiseProperty(systemProperty="#{iiopPorts}", result="#{pageSession.iiopPorts}"); + /> diff --git a/appserver/admingui/web/src/main/resources/serverPageNode.jsf b/appserver/admingui/web/src/main/resources/serverPageNode.jsf index ab6559143b8..eea135da593 100644 --- a/appserver/admingui/web/src/main/resources/serverPageNode.jsf +++ b/appserver/admingui/web/src/main/resources/serverPageNode.jsf @@ -38,7 +38,7 @@ only if the new code is made subject to such option by the copyright holder. - Portions Copyright [2018] [Payara Foundation and/or its affiliates] + Portions Copyright [2018-2024] [Payara Foundation and/or its affiliates] --> @@ -60,6 +60,7 @@ listAdd(value="#{pageSession.tmpPort}" list="#{pageSession.httpPortsList}"); } gf.resolveTokens(tokens="#{pageSession.httpPortsList}" endPoint="#{sessionScope.REST_URL}/servers/server/#{pageSession.instanceName}" resolvedTokens="#{pageSession.httpResolvedPortsList}"); - convertListToCommaString(list="#{pageSession.httpResolvedPortsList}" commaString="#{pageSession.httpPorts}"); + convertListToCommaString(list="#{pageSession.httpResolvedPortsList}" commaString="#{portList}"); + gf.sanitiseProperty(systemProperty="#{portList}", result="#{pageSession.httpPorts}"); /> From 05f9fed77325575f40c5cd2685cd4a327eeb77df Mon Sep 17 00:00:00 2001 From: Adrian S Date: Thu, 12 Sep 2024 08:54:20 +0300 Subject: [PATCH 43/49] Merge pull request #6944 from astoica1/FISH-9332-update-cargotracker FISH-9332: use a new branch for Cargotracker --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9b2862f5a62..469a53a1043 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -198,10 +198,10 @@ pipeline { // sh "rm -rf /tmp/cargo*" // // echo '*#*#*#*#*#*#*#*#*#*#*#*# Running test *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#' -// sh """mvn -B -V -ff -e clean install --strict-checksums -Dsurefire.useFile=false \ -// -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/lib/security/cacerts \ -// -Djavax.xml.accessExternalSchema=all -Dpayara.version=${pom.version} \ -// -Ppayara-server-remote -DtrimStackTrace=false""" +// sh """mvn -B -V -ff -e clean verify --strict-checksums -Dsurefire.useFile=false \ +// -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/lib/security/cacerts \ +// -Djavax.xml.accessExternalSchema=all \ +// -Ppayara-server-remote -DtrimStackTrace=false""" // echo '*#*#*#*#*#*#*#*#*#*#*#*# Ran test *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#' // } // post { From 45cddf6aab0ecf4cc28d2431d9ed33c2bd09acf8 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 12 Sep 2024 10:43:58 +0100 Subject: [PATCH 44/49] Merge pull request #6942 from payara/dependabot/maven/main/org.apache.maven.plugins-maven-deploy-plugin-3.1.3 Bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.2 to 3.1.3 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 32611d93ddf..caf4e65b902 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -173,7 +173,7 @@ 3.1.1 3.7.1 3.2.4 - 3.1.2 + 3.1.3 3.2.1 3.10.0 3.1.3 From f9f648c3df91be13f2792500e3a5e2f669593bca Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 13 Sep 2024 12:18:38 +0100 Subject: [PATCH 45/49] Merge pull request #6938 from payara/dependabot/maven/main/org.apache.maven.plugins-maven-surefire-plugin-3.5.0 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.5.0 --- appserver/tests/fish372-tests/datagrid-tests/pom.xml | 2 +- appserver/tests/payara-samples/samples/concurrency/pom.xml | 2 +- core/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appserver/tests/fish372-tests/datagrid-tests/pom.xml b/appserver/tests/fish372-tests/datagrid-tests/pom.xml index 1b8806a50ae..ac589bfe934 100644 --- a/appserver/tests/fish372-tests/datagrid-tests/pom.xml +++ b/appserver/tests/fish372-tests/datagrid-tests/pom.xml @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.5.0 false 0 diff --git a/appserver/tests/payara-samples/samples/concurrency/pom.xml b/appserver/tests/payara-samples/samples/concurrency/pom.xml index 344e17fee6b..80007e653f6 100644 --- a/appserver/tests/payara-samples/samples/concurrency/pom.xml +++ b/appserver/tests/payara-samples/samples/concurrency/pom.xml @@ -138,7 +138,7 @@ maven-surefire-plugin - 3.2.5 + 3.5.0 maven-war-plugin diff --git a/core/pom.xml b/core/pom.xml index caf4e65b902..dfbfd7cd8d6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -168,7 +168,7 @@ 3.4.0 3.13.0 true - 3.2.5 + 3.5.0 3.3.1 3.1.1 3.7.1 From dd5a9f6f736574df9c180efc92483677646e1453 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 13 Sep 2024 12:21:58 +0100 Subject: [PATCH 46/49] Merge pull request #6941 from payara/dependabot/maven/main/org.codehaus.mojo-exec-maven-plugin-3.4.1 Bump org.codehaus.mojo:exec-maven-plugin from 3.3.0 to 3.4.1 --- appserver/tests/payara-samples/samples/cleanboot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/samples/cleanboot/pom.xml b/appserver/tests/payara-samples/samples/cleanboot/pom.xml index f509325bd35..c0c3d056100 100644 --- a/appserver/tests/payara-samples/samples/cleanboot/pom.xml +++ b/appserver/tests/payara-samples/samples/cleanboot/pom.xml @@ -80,7 +80,7 @@ org.codehaus.mojo exec-maven-plugin - 3.3.0 + 3.4.1 install-playwright-dependencies From ddaefb7e36cce83a044a07d396057f193963b1b9 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 13 Sep 2024 12:24:09 +0100 Subject: [PATCH 47/49] Merge pull request #6945 from payara/dependabot/maven/main/org.primefaces-primefaces-14.0.5 Bump org.primefaces:primefaces from 14.0.2 to 14.0.5 --- .../payara-samples/samples/use-bundled-jsf-primefaces/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml b/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml index 6db112e5069..23409d8a5fe 100644 --- a/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml +++ b/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml @@ -82,7 +82,7 @@ org.primefaces primefaces - 14.0.2 + 14.0.5 jakarta From 6aee26f7e838941595c0356961e6784516a1677c Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 13 Sep 2024 12:26:36 +0100 Subject: [PATCH 48/49] Merge pull request #6947 from payara/dependabot/maven/main/org.junit-junit-bom-5.11.0 Bump org.junit:junit-bom from 5.10.3 to 5.11.0 --- appserver/tests/payara-samples/samples/concurrency/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/samples/concurrency/pom.xml b/appserver/tests/payara-samples/samples/concurrency/pom.xml index 80007e653f6..d970dc1730d 100644 --- a/appserver/tests/payara-samples/samples/concurrency/pom.xml +++ b/appserver/tests/payara-samples/samples/concurrency/pom.xml @@ -58,7 +58,7 @@ UTF-8 false 1.9.1.Final - 5.10.3 + 5.11.0 3.0.alpha4 3.0.3 3.3.1 From 782e2a90af81d2f7c8d924b988d0008953913dee Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 13 Sep 2024 12:28:23 +0100 Subject: [PATCH 49/49] Merge pull request #6948 from payara/dependabot/maven/main/com.microsoft.playwright-playwright-1.46.0 Bump com.microsoft.playwright:playwright from 1.45.0 to 1.46.0 --- appserver/tests/payara-samples/samples/cleanboot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/samples/cleanboot/pom.xml b/appserver/tests/payara-samples/samples/cleanboot/pom.xml index c0c3d056100..0bed7c77897 100644 --- a/appserver/tests/payara-samples/samples/cleanboot/pom.xml +++ b/appserver/tests/payara-samples/samples/cleanboot/pom.xml @@ -41,7 +41,7 @@ - 1.45.0 + 1.46.0