Merge branch 'master' into pr/7569

.github/dependabot.yml

@@ -12,10 +12,6 @@ updates:
     directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/ArtifactoryContainer"
     schedule:
       interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/DockerAgentContainer"
-    schedule:
-      interval: "weekly"
   - package-ecosystem: "docker"
     directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/FtpdContainer"
     schedule:
@@ -27,9 +23,6 @@ updates:
     directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer"
     schedule:
       interval: "weekly"
-    ignore:
-      - dependency-name: "ubuntu"
-        versions: [">=22.04"]
   - package-ecosystem: "docker"
     directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JabberContainer"
     schedule:
@@ -48,9 +41,6 @@ updates:
     directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JiraContainer"
     schedule:
       interval: "weekly"
-    ignore:
-      - dependency-name: "ubuntu"
-        versions: [">=22.04"]
   - package-ecosystem: "docker"
     directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/LdapContainer"
     schedule:
@@ -78,9 +68,6 @@ updates:
     directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/Tomcat10Container"
     schedule:
       interval: "weekly"
-    ignore:
-      - dependency-name: "ubuntu"
-        versions: [">=22.04"]
   - package-ecosystem: "docker"
     directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitLabContainer"
     schedule:

.github/workflows/verify-gradle-wrapper.yaml

@@ -8,4 +8,4 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/wrapper-validation-action@v3

Jenkinsfile

@@ -41,7 +41,7 @@ if (needSplittingFromWorkspace) {
 def axes = [
   jenkinsVersions: ['latest'],
   platforms: ['linux'],
-  jdks: [11, 21],
+  jdks: [17, 21],
   browsers: ['firefox'],
 ]
 

ath-container.sh

@@ -8,7 +8,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 uid=$(id -u)
 gid=$(id -g)
 tag='jenkins/ath'
-java_version="${java_version:-11}"
+java_version="${java_version:-17}"
 
 # high chance of uid / group already existing in the container
 # known to happen on macOS

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.111</version>
+    <version>1.114</version>
   </parent>
 
   <artifactId>acceptance-test-harness</artifactId>
@@ -31,13 +31,13 @@
     <changelist>999999-SNAPSHOT</changelist>
     <spotbugs.skip>true</spotbugs.skip>
     <jenkins.version>2.460-rc35072.c63da_6b_5a_fd7</jenkins.version>
-    <selenium.version>4.20.0</selenium.version>
+    <selenium.version>4.21.0</selenium.version>
     <guava.version>33.2.0-jre</guava.version> <!-- aligned with selenium -->
     <maven.version>3.8.1</maven.version>
     <maven-resolver.version>1.6.2</maven-resolver.version>
     <groovy.version>3.0.21</groovy.version>
     <monte.version>0.7.7.0</monte.version>
-    <slf4j.version>2.0.10</slf4j.version>
+    <slf4j.version>2.0.13</slf4j.version>
     <jffi.version>1.3.13</jffi.version>
   </properties>
 
@@ -243,12 +243,12 @@
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>remoting</artifactId>
-      <version>3206.vb_15dcf73f6a_9</version>
+      <version>3248.v65ecb_254c298</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.test</groupId>
       <artifactId>docker-fixtures</artifactId>
-      <version>190.vd6a_e600cb_775</version>
+      <version>200.v22a_e8766731c</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>

src/main/java/org/jenkinsci/test/acceptance/FallbackConfig.java

@@ -112,9 +112,9 @@ private WebDriver createWebDriver(TestCleaner cleaner, TestName testName) throws
             GeckoDriverService service = builder.build();
             return new FirefoxDriver(service, buildFirefoxOptions(testName));
         case "firefox-container":
-            return createContainerWebDriver(cleaner, "selenium/standalone-firefox:4.20.0", buildFirefoxOptions(testName));
+            return createContainerWebDriver(cleaner, "selenium/standalone-firefox:4.21.0", buildFirefoxOptions(testName));
         case "chrome-container":
-            return createContainerWebDriver(cleaner, "selenium/standalone-chrome:4.20.0", new ChromeOptions());
+            return createContainerWebDriver(cleaner, "selenium/standalone-chrome:4.21.0", new ChromeOptions());
         case "chrome":
             Map<String, String> prefs = new HashMap<String, String>();
             prefs.put(LANGUAGE_SELECTOR, "en");

src/main/resources/ath-container/Dockerfile

@@ -90,7 +90,7 @@ RUN echo \
       $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list
 
 # Ensure that version is fixed
-ARG DOCKER_VERSION=25.0.4
+ARG DOCKER_VERSION=26.1.3
 ARG DOCKER_BUILDX_VERSION=0.10.2
 RUN apt-get update --quiet \
   && apt-get install --yes --no-install-recommends \

src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer/Dockerfile

@@ -3,7 +3,7 @@
 # and prepares for execution of gitplugin tests.
 #
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN mkdir -p /var/run/sshd
 

src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitLabContainer/Dockerfile

@@ -1,5 +1,5 @@
 # Use the official GitLab Community Edition image as the base
-FROM gitlab/gitlab-ce:16.9.2-ce.0
+FROM gitlab/gitlab-ce:17.0.0-ce.0
 
 COPY create_user.rb /usr/bin/
 

src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JiraContainer/Dockerfile

@@ -3,7 +3,7 @@
 #
 #    The initial password is 'admin:admin'
 #
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 # Pin JIRA version to make the tests more predictable and less fragile
 # In particular, pinned to 6.X because from 7.X the SOAP API is gone, and it's
@@ -12,11 +12,11 @@ FROM ubuntu:22.04
 ENV JIRA_VERSION 6.3
 
 # base package installation
-RUN apt-get update && apt-get install -y apt-transport-https wget gnupg2 && echo "deb https://packages.atlassian.com/debian/atlassian-sdk-deb/ stable contrib" >> /etc/apt/sources.list
+RUN apt-get update && apt-get install -y apt-transport-https wget gnupg2 software-properties-common && add-apt-repository -s "deb https://packages.atlassian.com/debian/atlassian-sdk-deb/ stable contrib"
 RUN wget https://packages.atlassian.com/api/gpg/key/public
 RUN apt-key add public
 
-RUN apt-get update && apt-get install -y openjdk-8-jdk atlassian-plugin-sdk netcat
+RUN apt-get update && apt-get install -y openjdk-8-jdk atlassian-plugin-sdk netcat-openbsd
 
 # this will install the whole thing, launches Tomcat,
 # asks the user to do Ctrl+C to quit, then it shuts down presumably because it

src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshAgentContainer/Dockerfile

@@ -1,4 +1,4 @@
 # curl -s https://raw.githubusercontent.com/jenkinsci/docker-fixtures/master/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile | sha1sum | cut -c 1-12
-FROM jenkins/java:387404da3ce7
+FROM jenkins/java:978f1af53461
 COPY *.pub /tmp
 RUN cat /tmp/*.pub >> /home/test/.ssh/authorized_keys

src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/Tomcat10Container/Dockerfile

@@ -1,16 +1,11 @@
 #
-# Runs Tomcat7 on Ubuntu at port 8080, with the admin app
+# Runs Tomcat10 on Ubuntu at port 8080, with the admin app
 #
 # The admin user has username 'admin' and password 'tomcat'
 #
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
-RUN apt-get update && apt-get install -y gnupg
-
-# Tomcat7 is from Universe
-RUN echo "deb http://archive.ubuntu.com/ubuntu lunar universe" >> /etc/apt/sources.list
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 40976EAF437D05B5
 RUN apt-get update && apt-get install -y tomcat10 tomcat10-admin
 
 # configure the admin user

src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/XvncSlaveContainer/Dockerfile

@@ -1,6 +1,6 @@
 # curl -s https://raw.githubusercontent.com/jenkinsci/docker-fixtures/master/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile | sha1sum | cut -c 1-12
-FROM jenkins/java:387404da3ce7
-RUN apt-get update && apt-get install -y vnc4server imagemagick
+FROM jenkins/java:978f1af53461
+RUN apt-get update && apt-get install -y tigervnc-standalone-server imagemagick
 
 # So it is owned by root and has the permissions vncserver seems to require:
 RUN mkdir /tmp/.X11-unix && chmod 1777 /tmp/.X11-unix/

src/test/java/core/FreestyleJobTest.java

@@ -100,8 +100,7 @@ public void should_visit_build_with_permalink() {
         b.open();
         assertThat("Permalink link is current URL", driver.getCurrentUrl(), is(expectedUrl));
         assertThat("Build number is correct", b.getNumber(), is(1));
-        // TODO JENKINS-73168
-        //assertThat("Build has no changes", driver, hasContent("No changes"));
+        assertThat("Build has no changes", driver, hasContent("No changes"));
         assertThat("Build is success", b.getResult(), is(Build.Result.SUCCESS.name()));
     }
 

src/test/java/plugins/AntPluginTest.java

@@ -103,7 +103,7 @@ public void locallyInstalledAnt() {
         step.targets.set("-version");
         job.save();
 
-        String expectedVersion = "1.10.5"; // this is the version installed in the java container by the ubuntu bionic
+        String expectedVersion = "1.10.14"; // this is the version installed in the java container by the ubuntu noble
         job.startBuild().shouldSucceed().shouldContainsConsoleOutput(Pattern.quote(expectedVersion));
     }
 
@@ -118,7 +118,7 @@ public void testWithAntPipelineBlock() {
                 "}";
         String antHome = setUpAntInstallation();
 
-        String expectedVersion = "1.10.5"; // this is the version installed in the java container by the ubuntu bionic;
+        String expectedVersion = "1.10.14"; // this is the version installed in the java container by the ubuntu noble;
 
         WorkflowJob workflowJob = jenkins.jobs.create(WorkflowJob.class);
         workflowJob.script.set(script_pipeline_ant);

src/test/java/plugins/DescriptionSetterPluginTest.java

@@ -37,6 +37,6 @@ public void set_build_description_based_upon_build_log_file() {
         assertThat(find(by.css("div#description div")).getText(), is(equalTo(msg)));
 
         j.open();
-        assertThat(find(by.css("#buildHistory .desc")).getText(), is(equalTo(msg)));
+        assertThat(find(by.css("#buildHistoryPage .desc, #buildHistoryPage .app-builds-container__item__description")).getText(), is(equalTo(msg)));
     }
 }

src/test/java/plugins/NodeLabelParameterPluginTest.java

@@ -511,7 +511,7 @@ public boolean matchesSafely(Build build) {
     private org.hamcrest.Matcher<String> isPending(String nodename) {
         return allOf(
                 containsString("Job triggered without a valid online node, given where: " + nodename),
-                containsString("pending")
+                containsStringIgnoringCase("Pending")
         );
     }
 
@@ -524,8 +524,8 @@ private String getPendingBuildText(Build build) {
         build.job.open();
 
         // pending message comes from the queue, and queue's maintenance is asynchronous to UI threads.
-        // so if the original response doesn't contain it, we have to wait for the refersh of the build history.
+        // so if the original response doesn't contain it, we have to wait for the refresh of the build history.
         // so give it a bigger wait.
-        return find(by.css("#buildHistory")).getText();
+        return find(by.css("#buildHistoryPage")).getText();
     }
 }

src/test/java/plugins/SshSlavesPluginTest.java

@@ -208,15 +208,15 @@ private void verifyUnexpectedValueForCredential(String message, CredentialsPage
         setUp();
         SshSlaveLauncher launcher = configureDefaultSSHSlaveLauncher().pwdCredentials("test", "test");
 
-        String javaPath = "/usr/lib/jvm/java-11-openjdk-amd64/bin/java";
+        String javaPath = "/usr/lib/jvm/java-17-openjdk-amd64/bin/java";
         if (System.getProperty("os.arch").equals("aarch64")) {
-            javaPath = "/usr/lib/jvm/java-11-openjdk-arm64/bin/java";
+            javaPath = "/usr/lib/jvm/java-17-openjdk-arm64/bin/java";
         }
         launcher.setJavaPath(javaPath);
         slave.save();
 
         verify();
-        verifyLog("java-11-openjdk");
+        verifyLog("java-17-openjdk");
     }
 
     @Test public void jvmOptions() {