From dc6cbcea5025ab8bd47a69fab1af76be7c26d68e Mon Sep 17 00:00:00 2001
From: MicLieg <38057464+MicLieg@users.noreply.github.com>
Date: Sun, 5 May 2024 22:55:52 +0200
Subject: [PATCH] fix(mcserver): change required jdk to 21 (#4562)

* fix(mcserver): change required jdk to 21

* update java on other distros

---------

Co-authored-by: Daniel Gibbs <me@danielgibbs.co.uk>
---
 lgsm/data/almalinux-8.csv  |  8 ++++----
 lgsm/data/almalinux-9.csv  | 12 ++++++------
 lgsm/data/centos-7.csv     |  2 +-
 lgsm/data/centos-8.csv     |  2 +-
 lgsm/data/centos-9.csv     |  4 ++--
 lgsm/data/rhel-8.csv       | 12 ++++++------
 lgsm/data/rhel-9.csv       | 12 ++++++------
 lgsm/data/rocky-8.csv      | 12 ++++++------
 lgsm/data/rocky-9.csv      | 12 ++++++------
 lgsm/data/ubuntu-20.04.csv | 10 +++++-----
 lgsm/data/ubuntu-22.04.csv | 12 ++++++------
 lgsm/data/ubuntu-23.04.csv |  2 +-
 lgsm/data/ubuntu-23.10.csv |  2 +-
 13 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/lgsm/data/almalinux-8.csv b/lgsm/data/almalinux-8.csv
index e73fcfaa0..4d6c05ca5 100644
--- a/lgsm/data/almalinux-8.csv
+++ b/lgsm/data/almalinux-8.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,java-17-openjdk
+mc,java-21-openjdk
 mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
@@ -82,7 +82,7 @@ onset,mariadb-connector-c
 opfor
 pc
 pc2
-pmc,java-17-openjdk
+pmc,java-21-openjdk
 ps,GConf2
 pvkii
 pvr,libcxx
@@ -128,11 +128,11 @@ ut3
 ut99
 vh,glibc-devel
 vints,aspnetcore-runtime-7.0
-vpmc,java-17-openjdk
+vpmc,java-21-openjdk
 vs
 wet
 wf
-wmc,java-17-openjdk
+wmc,java-21-openjdk
 wurm,xorg-x11-server-Xvfb
 zmr,ncurses-libs.i686
 zps,ncurses-libs.i686
diff --git a/lgsm/data/almalinux-9.csv b/lgsm/data/almalinux-9.csv
index f5b5b5fc5..2cdd36575 100644
--- a/lgsm/data/almalinux-9.csv
+++ b/lgsm/data/almalinux-9.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,java-17-openjdk
+mc,java-21-openjdk
 mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
@@ -82,12 +82,12 @@ onset,mariadb-connector-c
 opfor
 pc
 pc2
-pmc,java-17-openjdk
+pmc,java-21-openjdk
 ps,GConf2
 pvkii
 pvr,libcxx
 pw
-pz,java-11-openjdk rng-tools
+pz,java-21-openjdk rng-tools
 q2
 q3
 q4
@@ -97,7 +97,7 @@ ricochet
 ro
 rtcw
 rust,zlib-devel
-rw,java-11-openjdk
+rw,java-21-openjdk
 samp
 sb
 sbots
@@ -128,11 +128,11 @@ ut3
 ut99
 vh,glibc-devel
 vints,aspnetcore-runtime-7.0
-vpmc,java-17-openjdk
+vpmc,java-21-openjdk
 vs
 wet
 wf
-wmc,java-17-openjdk
+wmc,java-21-openjdk
 wurm,xorg-x11-server-Xvfb
 zmr,ncurses-libs.i686
 zps,ncurses-libs.i686
diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv
index a80043346..df7422526 100644
--- a/lgsm/data/centos-7.csv
+++ b/lgsm/data/centos-7.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,java-11-openjdk
+mc,java-21-openjdk
 mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
diff --git a/lgsm/data/centos-8.csv b/lgsm/data/centos-8.csv
index e73fcfaa0..831bc38e9 100644
--- a/lgsm/data/centos-8.csv
+++ b/lgsm/data/centos-8.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,java-17-openjdk
+mc,java-21-openjdk
 mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
diff --git a/lgsm/data/centos-9.csv b/lgsm/data/centos-9.csv
index f5b5b5fc5..4d49ee66e 100644
--- a/lgsm/data/centos-9.csv
+++ b/lgsm/data/centos-9.csv
@@ -87,7 +87,7 @@ ps,GConf2
 pvkii
 pvr,libcxx
 pw
-pz,java-11-openjdk rng-tools
+pz,java-21-openjdk rng-tools
 q2
 q3
 q4
@@ -97,7 +97,7 @@ ricochet
 ro
 rtcw
 rust,zlib-devel
-rw,java-11-openjdk
+rw,java-21-openjdk
 samp
 sb
 sbots
diff --git a/lgsm/data/rhel-8.csv b/lgsm/data/rhel-8.csv
index e73fcfaa0..a378694b2 100644
--- a/lgsm/data/rhel-8.csv
+++ b/lgsm/data/rhel-8.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,java-17-openjdk
+mc,java-21-openjdk
 mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
@@ -82,12 +82,12 @@ onset,mariadb-connector-c
 opfor
 pc
 pc2
-pmc,java-17-openjdk
+pmc,java-21-openjdk
 ps,GConf2
 pvkii
 pvr,libcxx
 pw
-pz,java-11-openjdk rng-tools
+pz,java-21-openjdk rng-tools
 q2
 q3
 q4
@@ -97,7 +97,7 @@ ricochet
 ro
 rtcw
 rust,zlib-devel
-rw,java-11-openjdk
+rw,java-21-openjdk
 samp
 sb
 sbots
@@ -128,11 +128,11 @@ ut3
 ut99
 vh,glibc-devel
 vints,aspnetcore-runtime-7.0
-vpmc,java-17-openjdk
+vpmc,java-21-openjdk
 vs
 wet
 wf
-wmc,java-17-openjdk
+wmc,java-21-openjdk
 wurm,xorg-x11-server-Xvfb
 zmr,ncurses-libs.i686
 zps,ncurses-libs.i686
diff --git a/lgsm/data/rhel-9.csv b/lgsm/data/rhel-9.csv
index f5b5b5fc5..2cdd36575 100644
--- a/lgsm/data/rhel-9.csv
+++ b/lgsm/data/rhel-9.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,java-17-openjdk
+mc,java-21-openjdk
 mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
@@ -82,12 +82,12 @@ onset,mariadb-connector-c
 opfor
 pc
 pc2
-pmc,java-17-openjdk
+pmc,java-21-openjdk
 ps,GConf2
 pvkii
 pvr,libcxx
 pw
-pz,java-11-openjdk rng-tools
+pz,java-21-openjdk rng-tools
 q2
 q3
 q4
@@ -97,7 +97,7 @@ ricochet
 ro
 rtcw
 rust,zlib-devel
-rw,java-11-openjdk
+rw,java-21-openjdk
 samp
 sb
 sbots
@@ -128,11 +128,11 @@ ut3
 ut99
 vh,glibc-devel
 vints,aspnetcore-runtime-7.0
-vpmc,java-17-openjdk
+vpmc,java-21-openjdk
 vs
 wet
 wf
-wmc,java-17-openjdk
+wmc,java-21-openjdk
 wurm,xorg-x11-server-Xvfb
 zmr,ncurses-libs.i686
 zps,ncurses-libs.i686
diff --git a/lgsm/data/rocky-8.csv b/lgsm/data/rocky-8.csv
index e73fcfaa0..a378694b2 100644
--- a/lgsm/data/rocky-8.csv
+++ b/lgsm/data/rocky-8.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,java-17-openjdk
+mc,java-21-openjdk
 mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
@@ -82,12 +82,12 @@ onset,mariadb-connector-c
 opfor
 pc
 pc2
-pmc,java-17-openjdk
+pmc,java-21-openjdk
 ps,GConf2
 pvkii
 pvr,libcxx
 pw
-pz,java-11-openjdk rng-tools
+pz,java-21-openjdk rng-tools
 q2
 q3
 q4
@@ -97,7 +97,7 @@ ricochet
 ro
 rtcw
 rust,zlib-devel
-rw,java-11-openjdk
+rw,java-21-openjdk
 samp
 sb
 sbots
@@ -128,11 +128,11 @@ ut3
 ut99
 vh,glibc-devel
 vints,aspnetcore-runtime-7.0
-vpmc,java-17-openjdk
+vpmc,java-21-openjdk
 vs
 wet
 wf
-wmc,java-17-openjdk
+wmc,java-21-openjdk
 wurm,xorg-x11-server-Xvfb
 zmr,ncurses-libs.i686
 zps,ncurses-libs.i686
diff --git a/lgsm/data/rocky-9.csv b/lgsm/data/rocky-9.csv
index f5b5b5fc5..2cdd36575 100644
--- a/lgsm/data/rocky-9.csv
+++ b/lgsm/data/rocky-9.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,java-17-openjdk
+mc,java-21-openjdk
 mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
@@ -82,12 +82,12 @@ onset,mariadb-connector-c
 opfor
 pc
 pc2
-pmc,java-17-openjdk
+pmc,java-21-openjdk
 ps,GConf2
 pvkii
 pvr,libcxx
 pw
-pz,java-11-openjdk rng-tools
+pz,java-21-openjdk rng-tools
 q2
 q3
 q4
@@ -97,7 +97,7 @@ ricochet
 ro
 rtcw
 rust,zlib-devel
-rw,java-11-openjdk
+rw,java-21-openjdk
 samp
 sb
 sbots
@@ -128,11 +128,11 @@ ut3
 ut99
 vh,glibc-devel
 vints,aspnetcore-runtime-7.0
-vpmc,java-17-openjdk
+vpmc,java-21-openjdk
 vs
 wet
 wf
-wmc,java-17-openjdk
+wmc,java-21-openjdk
 wurm,xorg-x11-server-Xvfb
 zmr,ncurses-libs.i686
 zps,ncurses-libs.i686
diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv
index 4a41435c2..8d4cc6e52 100644
--- a/lgsm/data/ubuntu-20.04.csv
+++ b/lgsm/data/ubuntu-20.04.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,openjdk-17-jre
+mc,openjdk-21-jre
 mcb
 mh
 mohaa,libstdc++5:i386
@@ -82,12 +82,12 @@ onset,libmariadb-dev
 opfor
 pc
 pc2
-pmc,openjdk-17-jre
+pmc,openjdk-21-jre
 ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pw
-pz,openjdk-17-jre,rng-tools
+pz,openjdk-21-jre,rng-tools
 q2
 q3
 q4
@@ -97,7 +97,7 @@ ricochet
 ro
 rtcw
 rust,lib32z1
-rw,openjdk-17-jre
+rw,openjdk-21-jre
 samp
 sb
 sbots
@@ -132,7 +132,7 @@ vpmc,openjdk-11-jre
 vs
 wet
 wf
-wmc,openjdk-17-jre
+wmc,openjdk-21-jre
 wurm,xvfb
 zmr,libtinfo5:i386
 zps,libtinfo5:i386
diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv
index 323b82a08..67d28b5e9 100644
--- a/lgsm/data/ubuntu-22.04.csv
+++ b/lgsm/data/ubuntu-22.04.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,openjdk-17-jre
+mc,openjdk-21-jre
 mcb
 mh
 mohaa,libstdc++5:i386
@@ -82,12 +82,12 @@ onset,libmariadb-dev
 opfor
 pc
 pc2
-pmc,openjdk-17-jre
+pmc,openjdk-21-jre
 ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pw
-pz,openjdk-17-jre,rng-tools5
+pz,openjdk-21-jre,rng-tools5
 q2
 q3
 q4
@@ -97,7 +97,7 @@ ricochet
 ro
 rtcw
 rust,lib32z1
-rw,openjdk-17-jre
+rw,openjdk-21-jre
 samp
 sb
 sbots
@@ -128,11 +128,11 @@ ut3
 ut99
 vh,libc6-dev
 vints,aspnetcore-runtime-7.0
-vpmc,openjdk-17-jre
+vpmc,openjdk-21-jre
 vs
 wet
 wf
-wmc,openjdk-17-jre
+wmc,openjdk-21-jre
 wurm,xvfb
 zmr,libtinfo5:i386
 zps,libtinfo5:i386
diff --git a/lgsm/data/ubuntu-23.04.csv b/lgsm/data/ubuntu-23.04.csv
index e249a2968..8b2246402 100644
--- a/lgsm/data/ubuntu-23.04.csv
+++ b/lgsm/data/ubuntu-23.04.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,openjdk-17-jre
+mc,openjdk-21-jre
 mcb
 mh
 mohaa,libstdc++5:i386
diff --git a/lgsm/data/ubuntu-23.10.csv b/lgsm/data/ubuntu-23.10.csv
index e249a2968..8b2246402 100644
--- a/lgsm/data/ubuntu-23.10.csv
+++ b/lgsm/data/ubuntu-23.10.csv
@@ -65,7 +65,7 @@ kf
 kf2
 l4d
 l4d2
-mc,openjdk-17-jre
+mc,openjdk-21-jre
 mcb
 mh
 mohaa,libstdc++5:i386