From a98a4e0082deaff226cebb2a15611a272cbe0411 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 23:04:40 +0000
Subject: [PATCH 1/3] Initial plan


From 4d8e415469da3a128987c8b3858e0493c84790eb Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 23:06:31 +0000
Subject: [PATCH 2/3] Update Docker images to Java 25 and Maven 3.9.12

Co-authored-by: yury-s <9798949+yury-s@users.noreply.github.com>
---
 utils/docker/Dockerfile.jammy | 6 +++---
 utils/docker/Dockerfile.noble | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy
index d2fccc1ed..fcefc3be2 100644
--- a/utils/docker/Dockerfile.jammy
+++ b/utils/docker/Dockerfile.jammy
@@ -10,7 +10,7 @@ ENV LC_ALL=C.UTF-8
 # === INSTALL JDK and Maven ===
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends openjdk-21-jdk \
+    apt-get install -y --no-install-recommends openjdk-25-jdk \
     # Install utilities required for downloading browsers
     wget \
     # Install utilities required for downloading driver
@@ -23,12 +23,12 @@ RUN apt-get update && \
 
 # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
 # Java 21, so we install latest Maven from Apache instead.
-RUN VERSION=3.9.6 && \
+RUN VERSION=3.9.12 && \
     wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
     ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
 
 ARG PW_TARGET_ARCH
-ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-${PW_TARGET_ARCH}
+ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-${PW_TARGET_ARCH}
 
 # === BAKE BROWSERS INTO IMAGE ===
 
diff --git a/utils/docker/Dockerfile.noble b/utils/docker/Dockerfile.noble
index 5ff4bceb4..1a69fc349 100644
--- a/utils/docker/Dockerfile.noble
+++ b/utils/docker/Dockerfile.noble
@@ -10,7 +10,7 @@ ENV LC_ALL=C.UTF-8
 # === INSTALL JDK and Maven ===
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends openjdk-21-jdk \
+    apt-get install -y --no-install-recommends openjdk-25-jdk \
     # Install utilities required for downloading browsers
     wget \
     # Install utilities required for downloading driver
@@ -23,12 +23,12 @@ RUN apt-get update && \
 
 # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
 # Java 21, so we install latest Maven from Apache instead.
-RUN VERSION=3.9.6 && \
+RUN VERSION=3.9.12 && \
     wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
     ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
 
 ARG PW_TARGET_ARCH
-ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-${PW_TARGET_ARCH}
+ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-${PW_TARGET_ARCH}
 
 # === BAKE BROWSERS INTO IMAGE ===
 

From e6aa28409a46ef35ded34253756c34be24478953 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 23:07:24 +0000
Subject: [PATCH 3/3] Fix comments to reference Java 25 instead of Java 21

Co-authored-by: yury-s <9798949+yury-s@users.noreply.github.com>
---
 utils/docker/Dockerfile.jammy | 2 +-
 utils/docker/Dockerfile.noble | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy
index fcefc3be2..e66319a80 100644
--- a/utils/docker/Dockerfile.jammy
+++ b/utils/docker/Dockerfile.jammy
@@ -22,7 +22,7 @@ RUN apt-get update && \
     adduser pwuser
 
 # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
-# Java 21, so we install latest Maven from Apache instead.
+# Java 25, so we install latest Maven from Apache instead.
 RUN VERSION=3.9.12 && \
     wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
     ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
diff --git a/utils/docker/Dockerfile.noble b/utils/docker/Dockerfile.noble
index 1a69fc349..e0173bd6e 100644
--- a/utils/docker/Dockerfile.noble
+++ b/utils/docker/Dockerfile.noble
@@ -22,7 +22,7 @@ RUN apt-get update && \
     adduser pwuser
 
 # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
-# Java 21, so we install latest Maven from Apache instead.
+# Java 25, so we install latest Maven from Apache instead.
 RUN VERSION=3.9.12 && \
     wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
     ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/