Merge branch 'master' into enable-top-button-for-heterolist

Author: mawinter69

.github/renovate.json

@@ -106,6 +106,16 @@
       ],
       "enabled": false,
       "description": "maven-metadata.xml is missing for this really old package which is required by renovate"
+    },
+    {
+      "description": "Jackson 2.19.0 causes issues with Kubernetes client. See https://github.com/jenkinsci/bom/pull/5114",
+      "matchManagers": [
+        "maven"
+      ],
+      "allowedVersions": "<2.19.0",
+      "matchPackageNames": [
+        "org.jenkins-ci.plugins:jackson2-api"
+      ]
     }
   ],
   "customManagers": [

.github/workflows/require-changelog-label.yml

@@ -11,7 +11,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: mheap/github-action-required-labels@388fd6af37b34cdfe5a23b37060e763217e58b03 # v5
+      - uses: mheap/github-action-required-labels@fb29a14a076b0f74099f6198f77750e8fc236016 # v5
         with:
           mode: minimum
           count: 1

.gitpod/Dockerfile

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

ath.sh

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=6180.v889d0fe56785
+export ATH_VERSION=6254.vca_87b_2b_59e5a_
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17
@@ -26,33 +26,46 @@ fi
 mkdir -p target/ath-reports
 chmod a+rwx target/ath-reports
 
+curl \
+	--fail \
+	--silent \
+	--show-error \
+	--output /tmp/ath.yml \
+	--location "https://raw.githubusercontent.com/jenkinsci/acceptance-test-harness/refs/tags/${ATH_VERSION}/docker-compose.yml"
+
+sed -i -e "s/jenkins\/ath:latest/jenkins\/ath:${ATH_VERSION}/g" /tmp/ath.yml
+
 # obtain the groupId to grant to access the docker socket to run tests needing docker
-dockergid=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ubuntu:noble stat -c %g /var/run/docker.sock)
+if [[ -z ${DOCKER_GID:-} ]]; then
+	DOCKER_GID=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ubuntu:noble stat -c %g /var/run/docker.sock) || exit 1
+	export DOCKER_GID
+fi
+
+trap 'docker-compose --file /tmp/ath.yml kill && docker-compose --file /tmp/ath.yml down' EXIT
 
-exec docker run --rm \
+exec docker-compose \
+	--file /tmp/ath.yml \
+	run \
 	--env JDK \
 	--env ATH_VERSION \
 	--env BROWSER \
-	--shm-size 2g `# avoid selenium.WebDriverException exceptions like 'Failed to decode response from marionette' and webdriver closed` \
-	--group-add ${dockergid} \
+	--name mvn \
+	--no-TTY \
+	--rm \
 	--volume "$(pwd)"/war/target/jenkins.war:/jenkins.war:ro \
-	--volume /var/run/docker.sock:/var/run/docker.sock:rw \
 	--volume "$(pwd)"/target/ath-reports:/reports:rw \
-	--interactive \
-	jenkins/ath:"$ATH_VERSION" \
+	mvn \
 	bash <<-'INSIDE'
 		set -o errexit
 		set -o nounset
 		set -o pipefail
 		set -o xtrace
 		cd
 		set-java.sh "${JDK}"
-		# Start the VNC system provided by the image from the default user home directory
-		eval "$(vnc.sh)"
 		env | sort
-		git clone --branch "$ATH_VERSION" --depth 1 https://github.com/jenkinsci/acceptance-test-harness
+		git clone --branch "${ATH_VERSION}" --depth 1 https://github.com/jenkinsci/acceptance-test-harness
 		cd acceptance-test-harness
-		run.sh "$BROWSER" /jenkins.war \
+		run.sh "remote-webdriver-${BROWSER}" /jenkins.war \
 			-Dmaven.test.failure.ignore \
 			-DforkCount=1 \
 			-Dgroups=org.jenkinsci.test.acceptance.junit.SmokeTest

bom/pom.xml

@@ -38,10 +38,10 @@ THE SOFTWARE.
   <description>The module contains dependencies that are used by a specific Jenkins version</description>
 
   <properties>
-    <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
+    <commons-fileupload2.version>2.0.0-M3</commons-fileupload2.version>
     <groovy.version>2.4.21</groovy.version>
     <jelly.version>1.1-jenkins-20250108</jelly.version>
-    <stapler.version>1983.v93c53e94b_c04</stapler.version>
+    <stapler.version>1990.v99d303a_82457</stapler.version>
   </properties>
 
   <dependencyManagement>
@@ -63,15 +63,15 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>6.2.6</version>
+        <version>6.2.7</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <!-- https://docs.spring.io/spring-security/reference/6.3/getting-spring-security.html#getting-maven-no-boot -->
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-bom</artifactId>
-        <version>6.4.5</version>
+        <version>6.5.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -104,7 +104,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>1.10.1</version>
+        <version>1.11.0</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>

cli/src/test/java/hudson/cli/CLIConnectionFactoryTest.java

@@ -1,12 +1,13 @@
 package hudson.cli;
 
-import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 class CLIConnectionFactoryTest {
 
-    CLIConnectionFactory cliFactory;
+    private CLIConnectionFactory cliFactory;
 
     @BeforeEach
     void setUp() {
@@ -15,11 +16,11 @@ void setUp() {
 
     @Test
     void testBearerFromToken() {
-        Assertions.assertEquals("Bearer some-token", cliFactory.bearerAuth("some-token").authorization);
+        assertEquals("Bearer some-token", cliFactory.bearerAuth("some-token").authorization);
     }
 
     @Test
     void testBasicFromUserAndPass() {
-        Assertions.assertEquals("Basic c29tZTpwYXNz", cliFactory.basicAuth("some:pass").authorization);
+        assertEquals("Basic c29tZTpwYXNz", cliFactory.basicAuth("some:pass").authorization);
     }
 }

cli/src/test/java/hudson/cli/HexDumpTest.java

@@ -12,40 +12,40 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 @Execution(ExecutionMode.CONCURRENT)
-public class HexDumpTest {
+class HexDumpTest {
 
-  @DisplayName("Test HexDump.toHex(byte[] buf)")
-  @ParameterizedTest(name = "{index} => expected: {0}, buf: {1}")
-  @MethodSource("testToHex1Sources")
-  public void testToHex1(String expected, byte[] buf) {
-    assertEquals(expected, HexDump.toHex(buf));
-  }
+    @DisplayName("Test HexDump.toHex(byte[] buf)")
+    @ParameterizedTest(name = "{index} => expected: {0}, buf: {1}")
+    @MethodSource("testToHex1Sources")
+    void testToHex1(String expected, byte[] buf) {
+        assertEquals(expected, HexDump.toHex(buf));
+    }
 
-  static Stream<Arguments> testToHex1Sources() {
-    return Stream.of(
+    static Stream<Arguments> testToHex1Sources() {
+        return Stream.of(
             arguments("'fooBar'", new byte[] {'f', 'o', 'o', 'B', 'a', 'r'}),
             arguments("0xc3", new byte[] {(byte) 'Ã'}),
             arguments("0xac '100'", new byte[] {(byte) '€', '1', '0', '0'}),
             arguments("'1' 0xf7 '2'", new byte[] {'1', (byte) '÷', '2'}),
             arguments("'foo' 0x0a\n'Bar'", new byte[] {'f', 'o', 'o', '\n', 'B', 'a', 'r'})
-    );
-  }
+        );
+    }
 
-  @DisplayName("Test HexDump.toHex(byte[] buf, int start, int len)")
-  @ParameterizedTest(name = "{index} => expected: {0}, buf: {1}, start: {2}, len: {3}")
-  @MethodSource("testToHex2Sources")
-  public void testToHex2(String expected, byte[] buf, int start, int len) {
-    assertEquals(expected, HexDump.toHex(buf, start, len));
-  }
+    @DisplayName("Test HexDump.toHex(byte[] buf, int start, int len)")
+    @ParameterizedTest(name = "{index} => expected: {0}, buf: {1}, start: {2}, len: {3}")
+    @MethodSource("testToHex2Sources")
+    void testToHex2(String expected, byte[] buf, int start, int len) {
+        assertEquals(expected, HexDump.toHex(buf, start, len));
+    }
 
-  static Stream<Arguments> testToHex2Sources() {
-    return Stream.of(
+    static Stream<Arguments> testToHex2Sources() {
+        return Stream.of(
             arguments("'ooBa'", new byte[] {'f', 'o', 'o', 'B', 'a', 'r'}, 1, 4),
             arguments("0xc3", new byte[] {(byte) 'Ã'}, 0, 1),
             arguments("0xac '10'", new byte[] {(byte) '€', '1', '0', '0'}, 0, 3),
             arguments("0xf7 '2'", new byte[] {'1', (byte) '÷', '2'}, 1, 2),
             arguments("'Bar'", new byte[] {'f', 'o', 'o', '\n', 'B', 'a', 'r'}, 4, 3),
             arguments("", new byte[] {'f', 'o', 'o', 'B', 'a', 'r'}, 0, 0)
-    );
-  }
+        );
+    }
 }

cli/src/test/java/hudson/cli/PlainCLIProtocolTest.java

@@ -34,17 +34,17 @@
 import java.nio.charset.Charset;
 import org.junit.jupiter.api.Test;
 
-public class PlainCLIProtocolTest {
+class PlainCLIProtocolTest {
 
     @Test
-    public void ignoreUnknownOperations() throws Exception {
+    void ignoreUnknownOperations() throws Exception {
         final PipedOutputStream upload = new PipedOutputStream();
         final PipedOutputStream download = new PipedOutputStream();
         class Client extends PlainCLIProtocol.ClientSide {
             int code = -1;
             final ByteArrayOutputStream stdout = new ByteArrayOutputStream();
 
-            Client() throws IOException {
+            Client() {
                 super(new PlainCLIProtocol.FramedOutput(upload));
             }
 

cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java

@@ -18,13 +18,13 @@
 keys were generated with ssh-keygen from OpenSSH_7.9p1, LibreSSL 2.7.3
 */
 @Execution(ExecutionMode.CONCURRENT)
-public class PrivateKeyProviderTest {
+class PrivateKeyProviderTest {
 
     /**
     key command: ssh-keygen -f dsa -t dsa -b 1024 -m PEM
     */
     @Test
-    public void loadKeyDSA() throws IOException, GeneralSecurityException {
+    void loadKeyDSA() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("dsa").getFile());
         assertKeyPairNotNull(file, null);
     }
@@ -45,7 +45,7 @@ private void assertKeyPairNotNull(File file, String password) throws IOException
     key command: ssh-keygen -f dsa-password -t dsa -b 1024 -m PEM -P password
     */
     @Test
-    public void loadKeyDSAPassword() throws IOException, GeneralSecurityException {
+    void loadKeyDSAPassword() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("dsa-password").getFile());
         String password = "password";
         assertKeyPairNotNull(file, password);
@@ -55,7 +55,7 @@ public void loadKeyDSAPassword() throws IOException, GeneralSecurityException {
     key command: ssh-keygen -f rsa -t rsa -b 1024 -m PEM
     */
     @Test
-    public void loadKeyRSA() throws IOException, GeneralSecurityException {
+    void loadKeyRSA() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("rsa").getFile());
         assertKeyPairNotNull(file, null);
     }
@@ -64,7 +64,7 @@ public void loadKeyRSA() throws IOException, GeneralSecurityException {
     key command: ssh-keygen -f rsa-password -t rsa -b 1024 -m PEM -P password
     */
     @Test
-    public void loadKeyRSAPassword() throws IOException, GeneralSecurityException {
+    void loadKeyRSAPassword() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("rsa-password").getFile());
         String password = "password";
         assertKeyPairNotNull(file, password);
@@ -74,7 +74,7 @@ public void loadKeyRSAPassword() throws IOException, GeneralSecurityException {
     key command: ssh-keygen -f openssh -t rsa -b 1024
     */
     @Test
-    public void loadKeyOpenSSH() throws IOException, GeneralSecurityException {
+    void loadKeyOpenSSH() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("openssh").getFile());
         assertKeyPairNotNull(file, null);
     }
@@ -83,7 +83,7 @@ public void loadKeyOpenSSH() throws IOException, GeneralSecurityException {
      key command: ssh-keygen -f openssh-unsupported -t rsa -b 1024 -m PKCS8 -P password
      */
     @Test
-    public void loadKeyOpenSSHPKCS8() throws IOException, GeneralSecurityException {
+    void loadKeyOpenSSHPKCS8() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("openssh-pkcs8").getFile());
         String password = "password";
         assertKeyPairNotNull(file, password);
@@ -93,7 +93,7 @@ public void loadKeyOpenSSHPKCS8() throws IOException, GeneralSecurityException {
      key command: ssh-keygen -f openssh-unsupported -t rsa -b 1024 -m RFC4716 -p password
      */
     @Test
-    public void loadKeyOpenSSHRFC4716() throws IOException, GeneralSecurityException {
+    void loadKeyOpenSSHRFC4716() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("openssh-rfc4716").getFile());
         String password = "password";
         assertKeyPairNotNull(file, password);
@@ -104,7 +104,7 @@ public void loadKeyOpenSSHRFC4716() throws IOException, GeneralSecurityException
      Copy pasted the same key twice
      */
     @Test
-    public void loadKeyOpenSSHMultipleKeys() throws IOException, GeneralSecurityException {
+    void loadKeyOpenSSHMultipleKeys() {
         File file = new File(this.getClass().getResource("openssh-multiple-keys").getFile());
         String password = "password";
         assertThrows(InvalidKeySpecException.class, () -> PrivateKeyProvider.loadKey(file, password));
@@ -114,7 +114,7 @@ public void loadKeyOpenSSHMultipleKeys() throws IOException, GeneralSecurityExce
      * Uses a blank file
      */
     @Test
-    public void loadBlankKey() throws IOException, GeneralSecurityException {
+    void loadBlankKey() {
         File file = new File(this.getClass().getResource("blank").getFile());
         String password = "password";
         assertThrows(InvalidKeyException.class, () -> PrivateKeyProvider.loadKey(file, password));
@@ -125,7 +125,7 @@ public void loadBlankKey() throws IOException, GeneralSecurityException {
     in this key we remove some lines to break the key.
     */
     @Test
-    public void loadKeyBroken() throws IOException, GeneralSecurityException {
+    void loadKeyBroken() {
         File file = new File(this.getClass().getResource("openssh-broken").getFile());
         String password = "password";
         assertThrows(IllegalArgumentException.class, () -> PrivateKeyProvider.loadKey(file, password));