Merge pull request #25953 from arjantijms/9.0

Merge branch 'master' into 9.0

Author: arjantijms

Jenkinsfile

@@ -285,6 +285,39 @@ pipeline {
             }
          }
       }
+      stage('Check Changes') {
+         steps {
+            checkout scm
+            container('maven') {
+               script {
+                  // Default: run tests
+                  env.SKIP_TESTS = "false"
+
+                  // Only check for docs-only changes in PR builds
+                  if (env.CHANGE_TARGET) {
+                     echo "PR build detected, checking if only docs changed..."
+
+                     def relevantChanges = sh(
+                        script: '''
+                           (git diff --exit-code --name-only origin/${CHANGE_TARGET}...HEAD && echo "all") | sed '/^docs[/]/d'
+                        ''',
+                        returnStdout: true
+                     ).trim()
+
+
+                     if (relevantChanges == "") {
+                        env.SKIP_TESTS = "true"
+                        echo "✓ Only docs/ changes detected - tests will be skipped"
+                     } else {
+                        echo "✗ Relevant changes detected - tests will run"
+                     }
+                  } else {
+                     echo "Non-PR build - tests will always run"
+                  }
+               }
+            }
+         }
+      }
       stage('Build') {
          steps {
             checkout scm
@@ -331,6 +364,9 @@ pipeline {
       }
 
       stage('Test') {
+         when {
+            environment name: 'SKIP_TESTS', value: 'false'
+         }
          parallel {
             stage('main-tests') {
                steps {

appserver/admingui/community-theme/src/main/resources/org/glassfish/admingui/community-theme/Strings.properties

@@ -1,4 +1,5 @@
 #
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
 # Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
@@ -24,4 +25,4 @@ msg.JS.confirmLogout=Log Out of GlassFish Administration Console ?
 productName=GlassFish Server Open Source Edition
 promotionLink=java.sun.com/glassfish/productmsg.html
 
-copyright.fullPage=Copyright \u00a9 2005,2020, Oracle and/or its affiliates. All rights reserved.  <br><br>This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at http://www.eclipse.org/legal/epl-2.0. <br><br>This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability setforth in the Eclipse Public License v. 2.0 are satisfied: GNU General Public License, version 2 with the GNU Classpath Exception, which is available at https://www.gnu.org/software/classpath/license.html. <br><br>SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+copyright.fullPage=Copyright \u00a9 2026 Contributors to the Eclipse Foundation. <br>Copyright \u00a9 2005,2020, Oracle and/or its affiliates. All rights reserved.  <br><br>This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at http://www.eclipse.org/legal/epl-2.0. <br><br>This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability setforth in the Eclipse Public License v. 2.0 are satisfied: GNU General Public License, version 2 with the GNU Classpath Exception, which is available at https://www.gnu.org/software/classpath/license.html. <br><br>SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0

appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/Archivist.java

@@ -555,7 +555,7 @@ public ProcessingResult processAnnotations(T bundleDesc, ReadableArchive archive
 
 
     /**
-     * Process annotations in a bundle descriptor, the annoation processing
+     * Process annotations in a bundle descriptor, the annotation processing
      * is dependent on the type of descriptor being passed.
      */
     protected ProcessingResult processAnnotations(T bundleDesc, ModuleScanner<T> scanner, ReadableArchive archive)

appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ResourceValidator.java

@@ -31,7 +31,6 @@
 import com.sun.enterprise.deployment.deploy.shared.DeploymentPlanArchive;
 import com.sun.enterprise.deployment.deploy.shared.InputJarArchive;
 import com.sun.enterprise.deployment.deploy.shared.Util;
-import com.sun.enterprise.deployment.util.ResourceValidator;
 import com.sun.enterprise.util.LocalStringManagerImpl;
 import com.sun.enterprise.util.io.FileUtils;
 import com.sun.enterprise.v3.common.HTMLActionReporter;
@@ -111,9 +110,6 @@ public class DolProvider implements ApplicationMetaDataProvider<Application>,
     @Inject
     Provider<ClassLoaderHierarchy> clhProvider;
 
-    @Inject
-    ResourceValidator resourceValidator;
-
     private static final String WRITEOUT_XML = System.getProperty("writeout.xml");
 
     final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(DolProvider.class);

appserver/deployment/jakartaee-core/src/main/java/org/glassfish/javaee/core/deployment/DolProvider.java

@@ -18,7 +18,7 @@
 -->
 
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

appserver/extras/embedded/common/bootstrap/pom.xml

@@ -18,7 +18,7 @@
 -->
 
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.glassfish.main.extras</groupId>

appserver/extras/embedded/common/installroot-builder/pom.xml

@@ -18,7 +18,7 @@
 -->
 
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.glassfish.main.extras</groupId>

appserver/extras/embedded/common/instanceroot-builder/pom.xml

@@ -18,7 +18,7 @@
 -->
 
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
   <parent>

appserver/extras/embedded/common/osgi-main/pom.xml

@@ -18,7 +18,7 @@
 -->
 
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
   <parent>