From e63642b1462c9f6465d103031367bebbe3c77b1f Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Fri, 3 May 2024 15:59:20 +0200
Subject: [PATCH 1/4] Unlock yaml, because we are shipping it now

---
 .github/dependabot.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 18073415..d58ad832 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -30,6 +30,3 @@ updates:
       # HikariCP dropped Java 8 support with 5.0
       - dependency-name: "com.zaxxer:HikariCP"
         update-types: ["version-update:semver-major"]
-      # SnakeYAML has breaking changes with 2.0
-      - dependency-name: "org.yaml:snakeyaml"
-        update-types: ["version-update:semver-major"]

From f0209170c7f940d084aa93fe7b87c8220f2a47cf Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Fri, 3 May 2024 16:00:10 +0200
Subject: [PATCH 2/4] Exclude database windows authentication in velocity

It's very unlikely this is really needed.
---
 velocity/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/velocity/pom.xml b/velocity/pom.xml
index dec71bf5..70d9e149 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -92,6 +92,14 @@
                             <exclude>com.google.code.gson:gson</exclude>
                             <!-- Ships the same old version -->
                             <exclude>com.google.guava:guava</exclude>
+
+                            <exclude>org.checkerframework:checker-qual</exclude>
+                            <exclude>com.google.errorprone:error_prone_annotations</exclude>
+                            <exclude>com.github.ben-manes.caffeine:caffeine</exclude>
+
+<!--                            Exclude JNA implementation for WAFFLE - Windows Authentication Framework (mariadb)-->
+                            <exclude>com.github.waffle:waffle-jna</exclude>
+                            <exclude>net.java.dev.jna:*</exclude>
                         </excludes>
                     </artifactSet>
                     <transformers>

From 0ac8481d9278f4db712a75e81cb60fd413ff144a Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Sun, 5 May 2024 10:18:27 +0200
Subject: [PATCH 3/4] Synchronize velocity java version with upstream

---
 velocity/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/velocity/pom.xml b/velocity/pom.xml
index 70d9e149..441f18ac 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -44,7 +44,7 @@
     <name>FastLoginVelocity</name>
 
     <properties>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
     </properties>
 
     <build>

From 884a4e0d6575a4d07964a5b84acb9d1e1b125e2e Mon Sep 17 00:00:00 2001
From: hubert-praca <haczynek@gmail.com>
Date: Sat, 4 May 2024 22:04:46 +0200
Subject: [PATCH 4/4] Add critical guava and gson back from craftapi

Co-authored-by: games647 <games647@users.noreply.github.com>
---
 core/pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 895cad57..956fbcfa 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -208,6 +208,19 @@
             <version>0.8</version>
         </dependency>
 
+        <!-- Include deps from craftapi if not available on platform -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.10.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.0.1-jre</version>
+        </dependency>
+
+        <!-- Database driver included in Spigot -->
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>