Merge pull request #1200 from Freyhold/main

add removed dependency in last commit 8e35c5d that updated dependency
games647 · May 5, 2024 · 47b6835 · 47b6835
2 parents d58ef6b + 884a4e0
commit 47b6835
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git 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"]
diff --git 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>

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