Merge pull request #6630 from Pandrex247/Master-Sync-04-04-2024

Master Sync 10/05/2024
payara · May 13, 2024 · 8cbe000 · 8cbe000
2 parents 4292f2b + 28a7228
commit 8cbe000
Show file tree

Hide file tree

Showing 31 changed files with 374 additions and 95 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -33,7 +33,8 @@ pipeline {
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#  Building SRC  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                 sh """mvn -B -V -ff -e clean install --strict-checksums -PQuickBuild,jakarta-staging \
                     -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/lib/security/cacerts \
-                    -Djavax.xml.accessExternalSchema=all -Dbuild.number=${payaraBuildNumber}"""
+                    -Djavax.xml.accessExternalSchema=all -Dbuild.number=${payaraBuildNumber} \
+                    -Djavadoc.skip -Dsource.skip"""
                 echo '*#*#*#*#*#*#*#*#*#*#*#*#    Built SRC   *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
             }
             post {

diff --git a/appserver/admingui/cluster/src/main/resources/cluster/clusterSystemPropertiesButtons.jsf b/appserver/admingui/cluster/src/main/resources/cluster/clusterSystemPropertiesButtons.jsf
@@ -39,14 +39,15 @@
     holder.
 
 -->
+<!-- Portions Copyright 2024 Payara Foundation and/or its affiliates -->
 <sun:button id="saveButton" text="$resource{i18n.button.Save}" onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) {submitAndDisable(this, '$resource{i18n.button.Processing}');}; return false;" >
     <!command
         gf.isClusterName(clusterName="#{pageSession.clusterName}" );
         createMap(result="#{requestScope.data}");
         foreach (var="row" list="#{pageSession.tableList}") {
             mapPut(map="#{requestScope.data}", key="#{row.name}", value="#{row.overrideValue}");
         }
-        gf.restRequest(endpoint="#{pageSession.selfUrl}", method="POST", attrs="#{requestScope.data}", contentType="application/x-www-form-urlencoded", result="#{requestScope.restResponse}");
+        gf.restRequest(endpoint="#{pageSession.selfUrl}", method="PUT", attrs="#{requestScope.data}", contentType="application/x-www-form-urlencoded", result="#{requestScope.restResponse}");
         prepareSuccessfulMsg();
         gf.redirect(page="#{pageSession.selfPage}&alertType=${alertType}&alertSummary=${alertSummary}&alertDetail=${alertDetail}");
         />

diff --git a/appserver/admingui/common/src/main/resources/configuration/configSystemPropertiesButtons.jsf b/appserver/admingui/common/src/main/resources/configuration/configSystemPropertiesButtons.jsf
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright 2024 Payara Foundation and/or its affiliates -->
 
 
 <sun:button id="saveButton" text="$resource{i18n.button.Save}" >
@@ -51,7 +52,7 @@
         foreach (var="row" list="#{pageSession.tableList}") {
             mapPut(map="#{requestScope.data}", key="#{row.name}", value="#{row.value}");
         }
-        gf.restRequest(endpoint="#{pageSession.selfUrl}", method="POST", attrs="#{requestScope.data}", contentType="application/x-www-form-urlencoded", result="#{requestScope.restResponse}");
+        gf.restRequest(endpoint="#{pageSession.selfUrl}", method="PUT", attrs="#{requestScope.data}", contentType="application/x-www-form-urlencoded", result="#{requestScope.restResponse}");
         prepareSuccessfulMsg();
         gf.redirect(page="#{pageSession.selfPage}&alertType=${alertType}&alertSummary=${alertSummary}&alertDetail=${alertDetail}");
 		gf.isConfigName(configName="#{pageSession.configName}" );

diff --git a/appserver/admingui/devtests/pom.xml b/appserver/admingui/devtests/pom.xml
@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!--"Portions Copyright [2016-2019] [Payara Foundation and/or its affiliates]" -->
+<!--"Portions Copyright 2016-2024 [Payara Foundation and/or its affiliates]" -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -152,7 +152,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.6</version>
+            <version>4.5.13</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/appserver/appclient/client/acc-config/pom.xml b/appserver/appclient/client/acc-config/pom.xml
@@ -141,7 +141,7 @@
             -->
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.sun.xml.bind</groupId>

diff --git a/appserver/extras/docker-images/pom.xml b/appserver/extras/docker-images/pom.xml
@@ -57,7 +57,7 @@
         <docker.noCache>true</docker.noCache>
 
         <docker.java.repository>azul/zulu-openjdk</docker.java.repository>
-        <docker.jdk21.tag>21.0.2-jdk</docker.jdk21.tag>
+        <docker.jdk21.tag>21.0.3-jdk</docker.jdk21.tag>
 
         <!-- List of platform architectures which we wish to build Docker images for -
                 shouldn't have anything not provided as an option by ${docker.java.repository}.

diff --git a/appserver/extras/docker-images/tests/pom.xml b/appserver/extras/docker-images/tests/pom.xml
@@ -73,25 +73,25 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.19.3</version>
+            <version>1.19.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>1.19.3</version>
+            <version>1.19.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.10.1</version>
+            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.13</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/appserver/payara-appserver-modules/microprofile/metrics/pom.xml b/appserver/payara-appserver-modules/microprofile/metrics/pom.xml
@@ -63,7 +63,7 @@
             <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>jaxb2-maven-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.0</version>
             <executions>
                 <execution>
                     <id>schemagen</id>

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2016-2024] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright 2016-2024 Payara Foundation and/or its affiliates -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
@@ -82,11 +82,11 @@
         <!-- Java API for XML Registries Resource Adapter -->
         <jaxr.version>JAXR_RA_20091012</jaxr.version>
 
-        <nimbus-jose-jwt.version>9.35</nimbus-jose-jwt.version>
-        <accessors-smart.version>2.4.11</accessors-smart.version>
-        <json-smart.version>2.4.11</json-smart.version>
-        <reactor-core.version>3.4.4</reactor-core.version>
-        <reactive-streams.version>1.0.3</reactive-streams.version>
+        <nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
+        <accessors-smart.version>2.5.1</accessors-smart.version>
+        <json-smart.version>2.5.1</json-smart.version>
+        <reactor-core.version>3.6.4</reactor-core.version>
+        <reactive-streams.version>1.0.4</reactive-streams.version>
         <jcip-annotations.version>1.0-1</jcip-annotations.version>
 
         <!-- Yubico client validation version property -->
@@ -146,7 +146,7 @@
             <plugin>
                 <groupId>org.glassfish.build</groupId>
                 <artifactId>spec-version-maven-plugin</artifactId>
-                <version>1.2</version>
+                <version>2.2</version>
                 <configuration>
                     <!--suppress UnresolvedMavenProperty -->
                     <dir>${stage.dir}/${install.dir.name}/glassfish/modules</dir>
@@ -275,7 +275,7 @@
                             </artifact>
                             <nonFinal>false</nonFinal>
                             <jarType>api</jarType>
-                            <specVersion>1.2</specVersion>
+                            <specVersion>2.2</specVersion>
                             <specImplVersion>${jstl-impl.version}</specImplVersion>
                             <apiPackage>jakarta.servlet.jsp.jstl</apiPackage>
                         </spec>
@@ -586,7 +586,7 @@
             <dependency>
                 <groupId>org.netbeans.external</groupId>
                 <artifactId>ddl</artifactId>
-                <version>RELEASE82</version>
+                <version>RELEASE210</version>
             </dependency>
 
             <dependency>

diff --git a/appserver/tests/fish372-tests/datagrid-tests/pom.xml b/appserver/tests/fish372-tests/datagrid-tests/pom.xml
@@ -186,7 +186,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.22.2</version>
+        <version>3.2.5</version>
         <executions>
           <execution>
             <id>integration-test</id>

diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml
@@ -315,7 +315,7 @@
             <dependency>
                 <groupId>io.smallrye.config</groupId>
                 <artifactId>smallrye-config-repackaged</artifactId>
-                <version>2.7.0</version>
+                <version>3.8.1</version>
                 <classifier>jakartaee9</classifier>
                 <scope>test</scope>
                 <exclusions>
@@ -357,7 +357,7 @@
             <dependency>
                 <groupId>org.omnifaces</groupId>
                 <artifactId>omniutils</artifactId>
-                <version>0.11</version>
+                <version>0.13</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

diff --git 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 @@
     </parent>
     <groupId>io.smallrye.config</groupId>
     <artifactId>smallrye-config-repackaged</artifactId>
-    <version>2.7.0</version>
+    <version>3.8.1</version>
     <name>Payara Samples - Payara - smallrye-config repackaged as a module</name>
 
     <build>
@@ -140,13 +140,13 @@
         <dependency>
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-annotation</artifactId>
-            <version>1.8.0</version>
+            <version>2.4.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-expression</artifactId>
-            <version>1.8.0</version>
+            <version>2.4.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -158,7 +158,7 @@
         <dependency>
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-constraint</artifactId>
-            <version>1.8.0</version>
+            <version>2.3.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -170,7 +170,7 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>9.2</version>
+            <version>9.7</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

diff --git a/appserver/tests/payara-samples/samples/cleanboot/pom.xml b/appserver/tests/payara-samples/samples/cleanboot/pom.xml
@@ -41,7 +41,7 @@
     </parent>
 
     <properties>
-      <playwright.version>1.40.0</playwright.version>
+      <playwright.version>1.43.0</playwright.version>
     </properties>
 
 

diff --git a/appserver/tests/payara-samples/samples/concurrency/pom.xml b/appserver/tests/payara-samples/samples/concurrency/pom.xml
@@ -59,9 +59,9 @@
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <arquillian-bom.version>1.7.0.Alpha10</arquillian-bom.version>
         <junit-jupiter.version>5.8.2</junit-jupiter.version>
-        <arquillian-payara.version>3.0.alpha3</arquillian-payara.version>
-        <jakarta-concurrent.version>3.0.0</jakarta-concurrent.version>
-        <shrinkwrap.version>3.1.4</shrinkwrap.version>
+        <arquillian-payara.version>3.0.alpha4</arquillian-payara.version>
+        <jakarta-concurrent.version>3.0.3</jakarta-concurrent.version>
+        <shrinkwrap.version>3.3.0</shrinkwrap.version>
     </properties>
 
     <dependencyManagement>

diff --git a/appserver/tests/payara-samples/samples/reproducers/pom.xml b/appserver/tests/payara-samples/samples/reproducers/pom.xml
@@ -85,12 +85,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.13</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.13</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap.resolver</groupId>

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
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.primefaces</groupId>
             <artifactId>primefaces</artifactId>
-            <version>13.0.1</version>
+            <version>13.0.8</version>
             <classifier>jakarta</classifier>
         </dependency>
 

diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml
@@ -259,7 +259,7 @@
  <dependency>
                         <groupId>com.beust</groupId>
                         <artifactId>jcommander</artifactId>
-                        <version>1.72</version>
+                        <version>1.82</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/core/core-parent/pom.xml b/core/core-parent/pom.xml
@@ -238,7 +238,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>${maven.enforcer.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>enforce-versions</id>