From 31d5f228c7f5766e3b6ab7e7d16659c2616ea956 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 13 Jun 2025 20:08:28 +0000
Subject: [PATCH 1/3] Update buildpack-deps:jammy Docker digest to d4dd8c4

---
 base/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 2783e8b69..e9e575a9f 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:jammy@sha256:4b87c2ce43b264d82daa23fdbd88fb1b5f1bc61cbee338eba7a41a47236f7b9a
+FROM buildpack-deps:jammy@sha256:d4dd8c4891377f710f1509f5a3aa777e9d64f3c93f9b3be198a10cdd497c8ac4
 
 # Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer.
 ENV TRIGGER_REBUILD=2

From b49680c1f375705886d1d49817cb543ae445ad0d Mon Sep 17 00:00:00 2001
From: Kyle Brennan <kyle@gitpod.io>
Date: Fri, 13 Jun 2025 20:20:50 +0000
Subject: [PATCH 2/3] Fix maven build

---
 chunks/lang-java/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chunks/lang-java/Dockerfile b/chunks/lang-java/Dockerfile
index f6798516e..96d5d745b 100644
--- a/chunks/lang-java/Dockerfile
+++ b/chunks/lang-java/Dockerfile
@@ -17,7 +17,7 @@ RUN curl -fsSL "https://get.sdkman.io" | bash \
     && sdk default java ${JAVA_VERSION} \
     && sdk install gradle \
     # 4.x requires Java 17+ https://maven.apache.org/docs/history.html
-    && sdk install maven 3.9.9 \
+    && sdk install maven 3.9.10 \
     && sdk flush archives \
     && sdk flush temp \
     && mkdir /home/gitpod/.m2 \

From 94d697fddffc4a07ba4187deb4c6e0c3a41db7a6 Mon Sep 17 00:00:00 2001
From: Kyle Brennan <kyle@gitpod.io>
Date: Mon, 16 Jun 2025 13:11:19 +0000
Subject: [PATCH 3/3] Fix tool-nginx

---
 chunks/tool-nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chunks/tool-nginx/Dockerfile b/chunks/tool-nginx/Dockerfile
index baa712e23..9aa3f25f9 100644
--- a/chunks/tool-nginx/Dockerfile
+++ b/chunks/tool-nginx/Dockerfile
@@ -9,7 +9,7 @@ ENV TRIGGER_REBUILD=2
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
-RUN for _ppa in 'ppa:ondrej/php' 'ppa:ondrej/apache2' 'ppa:ondrej/nginx-mainline'; do add-apt-repository -y "$_ppa"; done \
+RUN for _ppa in 'ppa:ondrej/php' 'ppa:ondrej/apache2' 'ppa:ondrej/nginx'; do add-apt-repository -y "$_ppa"; done \
     && install-packages \
         apache2 \
         nginx \