summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Regdos <tomek@regdos.com>2024-04-24 14:34:37 +0200
committerConrad Kostecki <conikost@gentoo.org>2024-04-24 14:50:44 +0200
commit7ac36649f0fd687fbe945949b7356c4f3b8f5301 (patch)
tree4b93b0d3bd961bc96e9e11ef832985cb312c2a21 /games-server/minecraft-server
parentsys-apps/dmidecode: add 3.6 (diff)
downloadgentoo-7ac36649f0fd687fbe945949b7356c4f3b8f5301.tar.gz
gentoo-7ac36649f0fd687fbe945949b7356c4f3b8f5301.tar.bz2
gentoo-7ac36649f0fd687fbe945949b7356c4f3b8f5301.zip
games-server/minecraft-server: fix java version - 1.20.5 requires Java 21
Signed-off-by: Tomasz Regdos <tomek@regdos.com> Closes: https://github.com/gentoo/gentoo/pull/36402 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'games-server/minecraft-server')
-rw-r--r--games-server/minecraft-server/files/minecraft-server-bin2
-rw-r--r--games-server/minecraft-server/minecraft-server-1.20.5.ebuild4
2 files changed, 3 insertions, 3 deletions
diff --git a/games-server/minecraft-server/files/minecraft-server-bin b/games-server/minecraft-server/files/minecraft-server-bin
index b2664211f2cf..eb81aaf02103 100644
--- a/games-server/minecraft-server/files/minecraft-server-bin
+++ b/games-server/minecraft-server/files/minecraft-server-bin
@@ -6,7 +6,7 @@ JAVA_OPTS="$@"
MINECRAFT_OPTS="nogui"
# Choose JAVA
-set -- /opt/openjdk-bin-17.* /usr/lib*/openjdk-17
+set -- /opt/openjdk-bin-21.* /usr/lib*/openjdk-21
while ! [ -d "${1}" ]; do
if [ ${#} -eq 1 ]; then
echo "Error: No JAVA 17 runtime found!"
diff --git a/games-server/minecraft-server/minecraft-server-1.20.5.ebuild b/games-server/minecraft-server/minecraft-server-1.20.5.ebuild
index 7158fdbaf129..1c1c43fc0149 100644
--- a/games-server/minecraft-server/minecraft-server-1.20.5.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.20.5.ebuild
@@ -23,8 +23,8 @@ RDEPEND="
acct-user/minecraft
app-misc/dtach
|| (
- dev-java/openjdk:17
- dev-java/openjdk-bin:17
+ dev-java/openjdk:21
+ dev-java/openjdk-bin:21
)
"