Merge branch 'master' into new-reorderable-list-component

Author: janfaracik

ath.sh

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=6277.vb_5b_2154b_6691
+export ATH_VERSION=6294.v8837063f315d
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

core/pom.xml

@@ -623,6 +623,11 @@ THE SOFTWARE.
         <artifactId>maven-dependency-plugin</artifactId>
         <!-- Version specified in grandparent POM -->
         <executions>
+          <execution>
+            <goals>
+              <goal>properties</goal>
+            </goals>
+          </execution>
           <execution>
             <id>winsw</id>
             <goals>
@@ -651,7 +656,7 @@ THE SOFTWARE.
         <!-- Version specified in grandparent POM -->
         <configuration>
           <!-- Make sure to keep the directives in test/pom.xml and war/pom.xml in sync with these. -->
-          <argLine>@{jacocoSurefireArgs} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
+          <argLine>@{jacocoSurefireArgs} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -javaagent:${org.mockito:mockito-core:jar}</argLine>
           <reuseForks>false</reuseForks>
         </configuration>
       </plugin>

core/src/main/java/hudson/security/AuthenticationProcessingFilter2.java

@@ -39,10 +39,11 @@
 import jenkins.util.SystemProperties;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.springframework.http.HttpMethod;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
 
 /**
  * Login filter with a change for Jenkins so that
@@ -56,7 +57,7 @@ public final class AuthenticationProcessingFilter2 extends UsernamePasswordAuthe
 
     @SuppressFBWarnings(value = "HARD_CODE_PASSWORD", justification = "This is a password parameter, not a password")
     public AuthenticationProcessingFilter2(String authenticationGatewayUrl) {
-        setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher("/" + authenticationGatewayUrl, "POST"));
+        setRequiresAuthenticationRequestMatcher(PathPatternRequestMatcher.withDefaults().matcher(HttpMethod.POST, "/" + authenticationGatewayUrl));
         // Jenkins/login.jelly & SetupWizard/authenticate-security-token.jelly
         setUsernameParameter("j_username");
         setPasswordParameter("j_password");

core/src/main/java/jenkins/model/Jenkins.java

@@ -2830,12 +2830,13 @@ public <T> ExtensionList<T> getExtensionList(Class<T> extensionType) {
 
     /**
      * Formerly used to bind {@link ExtensionList}s to URLs.
-     * <p>
-     *     Currently handled by {@link jenkins.telemetry.impl.HttpExtensionList.ExtensionListRootAction}.
-     * </p>
      *
      * @since 1.349
+     * @deprecated This is no longer supported.
+     *      For URL access to descriptors, see {@link hudson.model.DescriptorByNameOwner}.
+     *      For URL access to specific other {@link hudson.Extension} annotated elements, create your own {@link hudson.model.Action}, like {@link hudson.console.ConsoleAnnotatorFactory.RootAction}.
      */
+    @Deprecated(since = "TODO")
     public ExtensionList getExtensionList(String extensionType) throws ClassNotFoundException {
         return getExtensionList(pluginManager.uberClassLoader.loadClass(extensionType));
     }

core/src/main/java/jenkins/telemetry/impl/HttpExtensionList.java

@@ -61,7 +61,7 @@ THE SOFTWARE.
           </j:otherwise>
         </j:choose>
       </div>
-      <img src="graph?type=${type}&amp;width=500&amp;height=300" />
+      <img src="graph?type=${type}&amp;width=500&amp;height=300" class="jenkins-graph-card" />
     </l:main-panel>
   </l:layout>
 </j:jelly>

core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly

@@ -73,7 +73,7 @@ THE SOFTWARE.
               </table>
               <t:iconSize/>
             </div>
-            <img class="build-time-graph" src="buildTimeGraph/png" width="500" height="400" lazymap="buildTimeGraph/map" alt="[${%Build time graph}]" />
+            <img class="build-time-graph jenkins-graph-card" src="buildTimeGraph/png" width="500" height="400" lazymap="buildTimeGraph/map" alt="[${%Build time graph}]" />
           </div>
     </l:main-panel>
   </l:layout>

core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly

@@ -47,7 +47,7 @@ THE SOFTWARE.
   </div>
   <noscript>
     <!-- The noscript alternative does not have the possibility to adjust the image to the available space -->
-    <img src="${prefix?:'loadStatistics'}/graph?type=${type}&amp;width=500&amp;height=300" srcset="${prefix?:'loadStatistics'}/graph?type=${type}&amp;width=500&amp;height=300&amp;scale=2 2x" alt="[${%Load statistics graph}]" />
+    <img src="${prefix?:'loadStatistics'}/graph?type=${type}&amp;width=500&amp;height=300" srcset="${prefix?:'loadStatistics'}/graph?type=${type}&amp;width=500&amp;height=300&amp;scale=2 2x" alt="[${%Load statistics graph}]" class="jenkins-graph-card" />
   </noscript>
   <p>
     ${%blurb}

core/src/main/resources/hudson/model/LoadStatistics/main.jelly

@@ -52,6 +52,7 @@
             "&height=500";
           const graphImgTag = document.createElement("img");
           graphImgTag.src = graphUrl;
+          graphImgTag.classList.add("jenkins-graph-card");
           graphImgTag.srcset = graphUrl + "&scale=2 2x";
           graphImgTag.alt = graphAlt;
           graphLocation.innerHTML = graphImgTag.outerHTML;