Merge branch 'master' into add-a-isconnected-method

Author: Vlatombe

.gitpod/Dockerfile

@@ -1,6 +1,6 @@
 FROM gitpod/workspace-full:latest
 ARG JAVA_VERSION=21.0.6-tem
-ARG MAVEN_VERSION=3.9.10
+ARG MAVEN_VERSION=3.9.11
 # Install Java 21, Maven and GitHub CLI
 RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \
     sdk install java ${JAVA_VERSION} && \

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.8</version>
+    <version>1.10</version>
   </extension>
 </extensions>

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=6300.v12732144c83f
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

bom/pom.xml

@@ -63,7 +63,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>6.2.8</version>
+        <version>6.2.9</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

cli/pom.xml

@@ -43,13 +43,6 @@
       <artifactId>commons-lang</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <!-- ed25519 algorithm, see JENKINS-45318 -->
-      <groupId>net.i2p.crypto</groupId>
-      <artifactId>eddsa</artifactId>
-      <version>0.3.0</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.sshd</groupId>
       <artifactId>sshd-common</artifactId>
@@ -62,6 +55,12 @@
       <version>${mina-sshd.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk18on</artifactId>
+      <version>1.81</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.tyrus.bundles</groupId>
       <artifactId>tyrus-standalone-client-jdk</artifactId>
@@ -155,6 +154,17 @@
                 </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
               </transformers>
+              <filters>
+                <filter>
+                  <!-- signature might cause some trouble -->
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
             </configuration>
           </execution>
         </executions>

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/Functions.java

@@ -2099,7 +2099,7 @@ public boolean hyperlinkMatchesCurrentPage(String href) {
     }
 
     /**
-     * If the given {@code Action} is a {@link RootAction#isPrimaryAction() primary} {code RootAction}, or a parent of the current page, return {@code true}.
+     * If the given {@code Action} is a {@link RootAction#isPrimaryAction() primary} {@code RootAction}, or a parent of the current page, return {@code true}.
      * Used in {@code actions.jelly} to decide if the action should shown in the main header or the hamburger.
      */
     @Restricted(NoExternalUse.class)

core/src/main/java/hudson/model/AsyncPeriodicWork.java

@@ -278,7 +278,7 @@ protected Level getErrorLoggingLevel() {
 
     /**
      * @return true if a new run should be queued if it is already running while called.
-     * @since TODO
+     * @since 2.517
      */
     protected boolean queueIfAlreadyRunning() {
         return false;

core/src/main/java/hudson/model/RootAction.java

@@ -54,8 +54,11 @@ public interface RootAction extends Action, ExtensionPoint {
     /**
      * Identifies if the action is a primary action.
      * Primary actions may be handled differently in the UI (for example, by always showing on the header rather than in an actions dropdown).
-     * In almost all cases this should return {@code false} which is the default
-     * @return {@code true} iff this action should be considered primary.
+     * In almost all cases this should return {@code false} which is the default.
+     * Examples of a Primary action would be where actions would be used regularly or they would need to be prominent to convey some status.
+     * As a concrete example, an action that provides a Help action with a submenu containing various different links, would be a prime candidate for this to return {@code true}.
+     * If your action has the possibility of a {@link #getBadge() badge} then this is another indicator that the action should return {@code true} (or otherwise restructured).
+     * @return {@code true} if and only if this action should be considered primary.
      * @since 2.516
      */
     default boolean isPrimaryAction() {

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");