Merge pull request #26011 from dmatej/fixdeployment9

Merge of main to 9.0 + fixed deployment

Author: arjantijms

.github/workflows/build-linux.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Build with Maven
       # qa skips documentation - we check it on Jenkins CI
       # We skip checkstyle too - we check it on Jenkins CI
-      run: mvn -B -e -ntp install -Pqa '-Dcheckstyle.skip=true'
+      run: mvn -B -e -ntp install -Pqa,snapshots '-Dcheckstyle.skip=true'
     - name: Upload server logs
       uses: actions/upload-artifact@v4
       if: failure()

.github/workflows/build-macos.yml

@@ -22,9 +22,9 @@ jobs:
     - name: Build with Maven
       # qa skips documentation - we check it on Jenkins CI
       # We skip checkstyle too - we check it on Jenkins CI
-      run: mvn -B -e -ntp install -Pqa '-Dcheckstyle.skip=true' -Pfastest
+      run: mvn -B -e -ntp install -Pqa,snapshots '-Dcheckstyle.skip=true' -Pfastest
     - name: Test GF Starts
-      run: mvn -B -e -ntp install '-Dcheckstyle.skip=true' -pl :glassfish-itest-tools
+      run: mvn -B -e -ntp install -Psnapshots '-Dcheckstyle.skip=true' -pl :glassfish-itest-tools
     - name: Upload server logs
       uses: actions/upload-artifact@v4
       if: failure()

.github/workflows/build-windows.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Build with Maven
       # qa skips documentation - we check it on Jenkins CI
       # We skip checkstyle too - we check it on Jenkins CI
-      run: mvn -B -e -ntp install -Pqa '-Dcheckstyle.skip=true'
+      run: mvn -B -e -ntp install '-Pqa,snapshots' '-Dcheckstyle.skip=true'
     - name: Upload server logs
       uses: actions/upload-artifact@v4
       if: failure()

Jenkinsfile

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2022, 2025 Contributors to the Eclipse Foundation
+* Copyright (c) 2022, 2026 Contributors to the Eclipse Foundation
 * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
 *
 * This program and the accompanying materials are made available under the
@@ -329,10 +329,10 @@ pipeline {
                       timeout(time: 1, unit: 'HOURS') {
                          sh '''
                          # Validate the structure in all submodules (especially version ids)
-                         mvn -V -B -e -fae clean validate -Ptck,set-version-id
+                         mvn -V -B -e -fae clean validate -Ptck,set-version-id,snapshots
                          '''
                          sh '''
-                         mvn -B -e install -Pfastest,ci -T4C
+                         mvn -B -e install -Pfastest,ci,snapshots -T4C
                          '''
                          sh '''
                          mvn -B -e clean
@@ -378,7 +378,7 @@ pipeline {
                            dumpSysInfo()
                            timeout(time: 4, unit: 'HOURS') {
                               sh '''
-                              mvn -B -e clean verify -Pqa,ci,ci-main-tests
+                              mvn -B -e clean verify -Pqa,ci,ci-main-tests,snapshots
                               '''
                            }
                         } finally {

appserver/admin/backup/src/main/java/com/sun/enterprise/backup/StringHelper.java

@@ -50,7 +50,7 @@ static String get(String s)
      * Convenience method which calls get(String, Object[])
      * @return the String from LocalStrings or the supplied String if it doesn't exist --
      * using the one supplied argument
-     * @see get(String, Object[])
+     * @see #get(String, Object[])
      */
     static String get(String s, Object o)
     {
@@ -61,7 +61,7 @@ static String get(String s, Object o)
      * Convenience method which calls get(String, Object[])
      * @return the String from LocalStrings or the supplied String if it doesn't exist --
      * using the two supplied arguments
-     * @see get(String, Object[])
+     * @see #get(String, Object[])
      */
     static String get(String s, Object o1, Object o2)
     {
@@ -72,7 +72,7 @@ static String get(String s, Object o1, Object o2)
      * Convenience method which calls get(String, Object[])
      * @return the String from LocalStrings or the supplied String if it doesn't exist --
      * using the three supplied arguments
-     * @see get(String, Object[])
+     * @see #get(String, Object[])
      */
     static String get(String s, Object o1, Object o2, Object o3)
     {

appserver/admingui/common/src/main/help/en/help/idx-3.html

@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2026 Contributors to the Eclipse Foundation.
     Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -52,7 +53,6 @@ <h2>P</h2>
 <dd>message security provider configurations, <a href="ref-messagesecurityproviderconfigprops.html#indexterm-235">Properties Specific to Message Security Provider Configurations</a></dd>
 <dd>PAM realm, <a href="ref-pamrealmprop.html#indexterm-214">Properties Specific to the PamRealm Class</a></dd>
 <dd>predefined system, <a href="ref-preconfiguredprops.html#indexterm-152">Predefined System Properties</a></dd>
-<dd>Solaris realm, <a href="ref-solarisrealmprop.html#indexterm-212">Properties Specific to the SolarisRealm Class</a></dd>
 <dd>system (reference), <a href="ref-systemproperties.html#indexterm-149">System Properties</a></dd>
 <dd>system (task), <a href="task-systemproperties.html#indexterm-18">To Manage System Properties</a></dd>
 </dl>
@@ -133,9 +133,6 @@ <h2>P</h2>
 </dd>
 </dl>
 <dl>
-<dd>Solaris realm, properties, <a href="ref-solarisrealmprop.html#indexterm-211">Properties Specific to the SolarisRealm Class</a></dd>
-</dl>
-<dl>
 <dd>SSL settings<dl>
 <dd>JMX connector (reference), <a href="ref-jmxconnectorssledit.html#indexterm-240">SSL</a></dd>
 <dd>JMX connector (task), <a href="task-jmxconnectorssledit.html#indexterm-117">To Edit SSL Settings for the JMX Connector</a></dd>

appserver/admingui/common/src/main/help/en/help/index.xml

@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2026 Contributors to the Eclipse Foundation.
     Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -299,7 +300,6 @@
     <indexitem text="message security provider configurations" target="ref-messagesecurityproviderconfigprops"></indexitem>
     <indexitem text="PAM realm" target="ref-pamrealmprop"></indexitem>
     <indexitem text="predefined system" target="ref-preconfiguredprops"></indexitem>
-    <indexitem text="Solaris realm" target="ref-solarisrealmprop"></indexitem>
     <indexitem text="system (reference)" target="ref-systemproperties"></indexitem>
     <indexitem text="system (task)" target="task-systemproperties"></indexitem>
   </indexitem>
@@ -343,9 +343,6 @@
     <indexitem text="viewing (reference)" target="ref-logviewer"></indexitem>
     <indexitem text="viewing (task)" target="task-logviewer"></indexitem>
   </indexitem>
-  <indexitem text="Solaris realm">
-    <indexitem text="properties" target="ref-solarisrealmprop"></indexitem>
-  </indexitem>
   <indexitem text="SSL settings">
     <indexitem text="JMX connector (reference)" target="ref-jmxconnectorssledit"></indexitem>
     <indexitem text="JMX connector (task)" target="task-jmxconnectorssledit"></indexitem>

appserver/admingui/common/src/main/help/en/help/ref-ldaprealmprop.html

@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2026 Contributors to the Eclipse Foundation.
     Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +25,7 @@ <h4><a id="sthref206" name="sthref206"></a><a id="sthref207" name="sthref207"></
 <dl>
 <dt>JAAS Context</dt>
 <dd>
-<p>The JAAS (Java Authentication and Authorization Service) context (the identifier for the login module to use for this realm). The only valid value is <code>solarisRealm</code>.</p>
+<p>The JAAS (Java Authentication and Authorization Service) context (the identifier for the login module to use for this realm). The only valid value is <code>ldapRealm</code>.</p>
 </dd>
 <dt>Directory</dt>
 <dd>

appserver/admingui/common/src/main/help/en/help/ref-realmedit.html

@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2026 Contributors to the Eclipse Foundation.
     Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -52,9 +53,6 @@ <h4><a id="sthref199" name="sthref199"></a>Edit Realm</h4>
 <p><a href="ref-ldaprealmprop.html">Properties Specific to the <code>LDAPRealm</code> Class</a></p>
 </li>
 <li>
-<p><a href="ref-solarisrealmprop.html">Properties Specific to the <code>SolarisRealm</code> Class</a></p>
-</li>
-<li>
 <p><a href="ref-pamrealmprop.html">Properties Specific to the <code>PamRealm</code> Class</a></p>
 </li>
 </ul>

appserver/admingui/common/src/main/help/en/help/ref-realmsnew.html

@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2026 Contributors to the Eclipse Foundation.
     Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -79,14 +80,6 @@ <h4><a id="sthref198" name="sthref198"></a>New Realm</h4>
 </td>
 </tr>
 <tr align="left" valign="top">
-<td align="left" id="r6c1-t6" headers="r1c1-t6">
-<p><code>solaris</code></p>
-</td>
-<td align="left" headers="r6c1-t6 r1c2-t6">
-<p><code>com.sun.enterprise.security.auth.realm.solaris.SolarisRealm</code></p>
-</td>
-</tr>
-<tr align="left" valign="top">
 <td align="left" id="r7c1-t6" headers="r1c1-t6">
 <p><code>PAM</code></p>
 </td>
@@ -117,9 +110,6 @@ <h4><a id="sthref198" name="sthref198"></a>New Realm</h4>
 <p><a href="ref-ldaprealmprop.html">Properties Specific to the <code>LDAPRealm</code> Class</a></p>
 </li>
 <li>
-<p><a href="ref-solarisrealmprop.html">Properties Specific to the <code>SolarisRealm</code> Class</a></p>
-</li>
-<li>
 <p><a href="ref-pamrealmprop.html">Properties Specific to the <code>PamRealm</code> Class</a></p>
 </li>
 </ul>