From 86f2d89cf453f9bb11b6c3e289d486472f69ed4f Mon Sep 17 00:00:00 2001
From: mohammed jasem alaajel <xrambad@gmail.com>
Date: Sat, 9 Jul 2022 14:43:31 +0400
Subject: [PATCH] due velocity including some libs by default, had to move
 depends to api than the parent, and exlude it from being included in shade

---
 RedisBungee-API/pom.xml      | 33 +++++++++++++++++++++++++++++++++
 RedisBungee-Velocity/pom.xml | 11 ++++++-----
 pom.xml                      | 33 ---------------------------------
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/RedisBungee-API/pom.xml b/RedisBungee-API/pom.xml
index d645436..974fe1a 100644
--- a/RedisBungee-API/pom.xml
+++ b/RedisBungee-API/pom.xml
@@ -86,4 +86,37 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.1-jre</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>4.2.3</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.11.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/RedisBungee-Velocity/pom.xml b/RedisBungee-Velocity/pom.xml
index 2106afb..9f72720 100644
--- a/RedisBungee-Velocity/pom.xml
+++ b/RedisBungee-Velocity/pom.xml
@@ -84,11 +84,6 @@
                                     <shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.okio
                                     </shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>com.google</pattern>
-                                    <shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.google
-                                    </shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>org.json</pattern>
                                     <shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.json
@@ -112,6 +107,12 @@
             <groupId>com.imaginarycode.minecraft</groupId>
             <artifactId>RedisBungee-API</artifactId>
             <version>${parent.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.velocitypowered</groupId>
diff --git a/pom.xml b/pom.xml
index cde5767..d89d5b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,37 +26,4 @@
         <module>RedisBungee-Velocity</module>
     </modules>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>4.2.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-            <version>2.11.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>2.7.5</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
 </project>