Skip to content

Commit c2cd8d9

Browse files
committed
patch: upgrade to java 21, netty 4.2.0.Final
1 parent c8939cb commit c2cd8d9

File tree

6 files changed

+68
-5
lines changed

6 files changed

+68
-5
lines changed

Benchmarks/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<buildtag.prefix>git-Bukkit-</buildtag.prefix>
1717
<buildtag.suffix></buildtag.suffix>
1818
<!--PaperSpigot - Bump to 1.8 - This will haunt me -->
19-
<!-- KigPaper - Java 17 -->
20-
<maven.compiler.release>17</maven.compiler.release>
19+
<!-- KigPaper - Java 21 -->
20+
<maven.compiler.release>21</maven.compiler.release>
2121
</properties>
2222

2323
<parent>

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG git_ref
22
FROM --platform=linux/amd64 ghcr.io/projectkig/kigpaper/kig-paper-builder:${git_ref} AS builder
33

4-
FROM eclipse-temurin:17-jre
4+
FROM eclipse-temurin:21-jre
55
RUN apt-get update && apt-get install -y curl ca-certificates openssl git tar bash sqlite3 fontconfig \
66
&& adduser --disabled-password --home /home/container container && mkdir -p /home/server/plugins \
77
&& chown -R container:container /home/server && echo eula=true > eula.txt \
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From c591d99a9fcd16a17cb7c103542aee6c81de889e Mon Sep 17 00:00:00 2001
2+
From: RoccoDev <[email protected]>
3+
Date: Tue, 15 Apr 2025 21:00:48 +0200
4+
Subject: [PATCH] Upgrade to Java 21, upgrade Netty to 4.2.0.Final
5+
6+
7+
diff --git a/pom.xml b/pom.xml
8+
index 80076c6f..872732df 100644
9+
--- a/pom.xml
10+
+++ b/pom.xml
11+
@@ -20,9 +20,9 @@
12+
13+
<properties>
14+
<!--PaperSpigot - Bump to 1.8 - This will haunt me -->
15+
- <!-- KigPaper - Java 17 -->
16+
+ <!-- KigPaper - Java 21 -->
17+
<additionalparam>-Xdoclint:none</additionalparam>
18+
- <maven.compiler.release>17</maven.compiler.release>
19+
+ <maven.compiler.release>21</maven.compiler.release>
20+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21+
</properties>
22+
23+
--
24+
2.48.1
25+
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 8ebf84f1d2c2b8d03261a3510681fb40df5309b1 Mon Sep 17 00:00:00 2001
2+
From: RoccoDev <[email protected]>
3+
Date: Tue, 15 Apr 2025 21:00:48 +0200
4+
Subject: [PATCH] Upgrade to Java 21, upgrade Netty to 4.2.0.Final
5+
6+
7+
diff --git a/pom.xml b/pom.xml
8+
index cb6f3e3d1..3c615f489 100644
9+
--- a/pom.xml
10+
+++ b/pom.xml
11+
@@ -14,12 +14,12 @@
12+
<junit.version>4.13.2</junit.version>
13+
<minecraft.version>1.8.8</minecraft.version>
14+
<minecraft_version>1_8_R3</minecraft_version>
15+
- <netty.version>4.1.86.Final</netty.version>
16+
+ <netty.version>4.2.0.Final</netty.version>
17+
<buildtag.prefix>git-Bukkit-</buildtag.prefix>
18+
<buildtag.suffix></buildtag.suffix>
19+
<!--PaperSpigot - Bump to 1.8 - This will haunt me -->
20+
- <!-- KigPaper - Java 17 -->
21+
- <maven.compiler.release>17</maven.compiler.release>
22+
+ <!-- KigPaper - Java 21 -->
23+
+ <maven.compiler.release>21</maven.compiler.release>
24+
</properties>
25+
26+
<parent>
27+
@@ -262,7 +262,7 @@
28+
<plugin>
29+
<groupId>net.md-5</groupId>
30+
<artifactId>specialsource-maven-plugin</artifactId>
31+
- <version>1.2.3</version>
32+
+ <version>2.0.4</version>
33+
<executions>
34+
<execution>
35+
<phase>package</phase>
36+
--
37+
2.48.1
38+

docker/build.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3.9.4-eclipse-temurin-17-alpine
1+
FROM maven:3.9.9-eclipse-temurin-21-alpine
22
WORKDIR build
33
COPY . .
44
RUN apk add --no-cache --update git bash patch zip && git config --global user.name "Kig Docker" && git config --global user.email "[email protected]" && bash build.sh

docker/j9.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG git_ref
22
FROM --platform=linux/amd64 ghcr.io/projectkig/kigpaper/kig-paper-builder:${git_ref} AS builder
33

4-
FROM ibm-semeru-runtimes:open-17-jre
4+
FROM ibm-semeru-runtimes:open-21-jre
55
RUN apt-get update && apt-get install -y curl ca-certificates openssl git tar bash sqlite3 fontconfig \
66
&& adduser --disabled-password --home /home/container container && mkdir -p /home/server/plugins \
77
&& chown -R container:container /home/server && echo eula=true > eula.txt \

0 commit comments

Comments
 (0)