Merge branch 'hotfix/v24.2.1' into develop

GameServerManagers · May 6, 2024 · c662a83 · c662a83
2 parents ad2f815 + 0b8a223
commit c662a83
Show file tree

Hide file tree

Showing 18 changed files with 203 additions and 65 deletions.
diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Add to Project
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           project-url: https://github.com/orgs/GameServerManagers/projects/11
           github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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