From 34df752dbfe3de9b74f2f7d489d53543c8399a79 Mon Sep 17 00:00:00 2001 From: Maximilian Irlinger Date: Fri, 4 Nov 2022 12:45:26 +0100 Subject: [PATCH] docker: use opendjdk-17-jdk on Debian Sid, closes #4627 --- doc/news/_preparation_next_release.md | 4 ++-- scripts/docker/debian/sid/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md index 3414d5373fd..4649a274607 100644 --- a/doc/news/_preparation_next_release.md +++ b/doc/news/_preparation_next_release.md @@ -413,7 +413,7 @@ This section keeps you up-to-date with the multi-language support provided by El - Fix warning for CMP0115 _(0x6178656c)_ - <> - <> -- <> +- Pass `--stacktrace` to gradle for the JNA builds. _(Maximilian Irlinger @atmaxinger)_ - <> - <> @@ -423,7 +423,7 @@ This section keeps you up-to-date with the multi-language support provided by El - <> - <> - <> -- <> +- Use `openjdk-17-jdk` in Debian Sid. _(Maximilian Irlinger @atmaxinger)_ - <> ## Infrastructure diff --git a/scripts/docker/debian/sid/Dockerfile b/scripts/docker/debian/sid/Dockerfile index d1a6fc6cb9a..8fa6c778aa9 100644 --- a/scripts/docker/debian/sid/Dockerfile +++ b/scripts/docker/debian/sid/Dockerfile @@ -49,7 +49,7 @@ RUN apt-get update && apt-get -y install \ moreutils \ ninja-build \ npm \ - openjdk-11-jdk \ + openjdk-17-jdk \ pkg-config \ python3-dev \ python3-pip \