Skip to content

Commit e9d4b43

Browse files
Merge branch 'master' into issue-64708
2 parents 5805c6e + 7358513 commit e9d4b43

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ and
371371
<dependency>
372372
<groupId>org.json</groupId>
373373
<artifactId>json</artifactId>
374-
<version>20250107</version>
374+
<version>20250517</version>
375375
</dependency>
376376
<dependency>
377377
<groupId>org.kohsuke</groupId>

src/main/resources/ath-container/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get update \
2626
&& rm -rf /var/lib/apt/lists/*
2727

2828
# Install a fixed firefox version that is known to work with the current selenium version, copied from https://support.mozilla.org/en-US/kb/install-firefox-linux
29-
ARG FIREFOX_VERSION=138.0.3
29+
ARG FIREFOX_VERSION=138.0.4
3030
RUN install -m 0755 -d /etc/apt/keyrings \
3131
&& curl -fsSL https://packages.mozilla.org/apt/repo-signing-key.gpg -o /etc/apt/keyrings/packages.mozilla.org.asc \
3232
&& printf 'deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main\n' > /etc/apt/sources.list.d/mozilla.list \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the official GitLab Community Edition image as the base
2-
FROM gitlab/gitlab-ce:17.11.2-ce.0
2+
FROM gitlab/gitlab-ce:18.0.0-ce.0
33

44
COPY create_user.rb /usr/bin/
55

0 commit comments

Comments
 (0)