From c905ca3d330dc08e780f3aec089bb7c231a1212f Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Sun, 5 May 2024 13:23:07 +0200
Subject: [PATCH] Move excluded shaded list to dependencies directly

It seems to be easier where the dependencies are coming from.
---
 bungee/pom.xml   | 23 +++++++++++++++--------
 velocity/pom.xml | 42 ++++++++++++++++++++++++------------------
 2 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/bungee/pom.xml b/bungee/pom.xml
index 46b1489c..f0cf4f5b 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -57,14 +57,6 @@
 
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
-                    <artifactSet>
-                        <excludes>
-                            <!--Those classes are already present in BungeeCord version-->
-                            <exclude>net.md-5:bungeecord-config</exclude>
-                            <exclude>com.google.code.gson:gson</exclude>
-                            <exclude>com.google.guava:guava</exclude>
-                        </excludes>
-                    </artifactSet>
                     <relocations>
                         <relocation>
                             <pattern>com.zaxxer.hikari</pattern>
@@ -124,6 +116,21 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>fastlogin.core</artifactId>
             <version>${project.version}</version>
+            <!--Those classes are already present in BungeeCord version-->
+            <exclusions>
+                <exclusion>
+                    <groupId>net.md-5</groupId>
+                    <artifactId>bungeecord-config</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--BungeeCord with also the part outside the API-->
diff --git a/velocity/pom.xml b/velocity/pom.xml
index 441f18ac..6374ed97 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -84,24 +84,6 @@
                             <shadedPattern>fastlogin.mariadb</shadedPattern>
                         </relocation>
                     </relocations>
-                    <artifactSet>
-                        <!--org.slf4j is part of velocity api and runtime,
-                        shading and relocating it causes logger injection to fail-->
-                        <excludes>
-                            <exclude>org.slf4j:*</exclude>
-                            <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>
                         <transformer
                                 implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
@@ -150,6 +132,23 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>fastlogin.core</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <!-- Velocity ships an older version -->
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+                <!--org.slf4j is part of velocity api and runtime, shading and relocating it causes
+                logger injection to fail-->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--Velocity api-->
@@ -165,6 +164,13 @@
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
             <version>3.3.3</version>
+            <exclusions>
+                <!-- Exclude JNA implementation for WAFFLE - Windows Authentication Framework (mariadb)-->
+                <exclusion>
+                    <groupId>com.github.waffle</groupId>
+                    <artifactId>waffle-jna</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         
         <!-- Bedrock player bridge -->