From e0274e7202d9b65f49728d5c59a8baf70d758778 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Fri, 29 Mar 2024 21:23:37 +1100
Subject: [PATCH] Add support for Java 22

By: md_5 <git@md-5.net>
---
 paper-server/pom.xml                                        | 6 +++---
 paper-server/src/main/java/org/bukkit/craftbukkit/Main.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/paper-server/pom.xml b/paper-server/pom.xml
index 44aba403a1..f6978dd080 100644
--- a/paper-server/pom.xml
+++ b/paper-server/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-commons</artifactId>
-            <version>9.5</version>
+            <version>9.7</version>
             <scope>compile</scope>
         </dependency>
         <!-- Mojang depends -->
@@ -278,13 +278,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.5.0</version>
+            <version>5.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-tree</artifactId>
-            <version>9.5</version>
+            <version>9.7</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
index e316c0fb41..8c6683992a 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -165,8 +165,8 @@ public class Main {
                 System.err.println("Unsupported Java detected (" + javaVersion + "). This version of Minecraft requires at least Java 17. Check your Java version with the command 'java -version'.");
                 return;
             }
-            if (javaVersion > 65.0) {
-                System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 21 is supported.");
+            if (javaVersion > 66.0) {
+                System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 22 is supported.");
                 return;
             }
             String javaVersionName = System.getProperty("java.version");