From 81a48bf96d0f336c4e2e96e67f77b3162e64ea77 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
Date: Wed, 2 Sep 2020 00:38:10 -0400
Subject: [PATCH] Relocate the rest of our dependencies (#1227)

- Relocate all of our dependencies. This does not include MCProtocolLib and Nukkit dependencies at this time as there are no other known plugins that use these dependencies.
- Switch to a static commit for Adventure dependencies.

Tested working on all versions.
---
 bootstrap/bungeecord/pom.xml | 16 ++++++++++++++++
 bootstrap/spigot/pom.xml     | 12 ++++++++++++
 bootstrap/sponge/pom.xml     | 12 ++++++++++++
 bootstrap/velocity/pom.xml   | 16 ++++++++++++++++
 connector/pom.xml            | 12 ++++++------
 5 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 682690a21..3fb7090f8 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -61,6 +61,10 @@
                                     <pattern>net.md_5.bungee.jni</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.jni</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.fasterxml.jackson</pattern>
+                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.jackson</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>io.netty</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.netty</shadedPattern>
@@ -69,6 +73,18 @@
                                     <pattern>org.reflections</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.reflections</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.google.guava</pattern>
+                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.guava</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.dom4j</pattern>
+                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.dom4j</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>net.kyori.adventure</pattern>
+                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.adventure</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index 8b3ad7428..79bdfea01 100644
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@@ -79,6 +79,18 @@
                                     <pattern>org.reflections</pattern>
                                     <shadedPattern>org.geysermc.platform.spigot.shaded.reflections</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.google.guava</pattern>
+                                    <shadedPattern>org.geysermc.platform.spigot.shaded.guava</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.dom4j</pattern>
+                                    <shadedPattern>org.geysermc.platform.spigot.shaded.dom4j</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>net.kyori.adventure</pattern>
+                                    <shadedPattern>org.geysermc.platform.spigot.shaded.adventure</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
index c21a3a539..3c20239f1 100644
--- a/bootstrap/sponge/pom.xml
+++ b/bootstrap/sponge/pom.xml
@@ -73,6 +73,18 @@
                                     <pattern>org.reflections</pattern>
                                     <shadedPattern>org.geysermc.platform.sponge.shaded.reflections</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.google.guava</pattern>
+                                    <shadedPattern>org.geysermc.platform.sponge.shaded.guava</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.dom4j</pattern>
+                                    <shadedPattern>org.geysermc.platform.sponge.shaded.dom4j</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>net.kyori.adventure</pattern>
+                                    <shadedPattern>org.geysermc.platform.sponge.shaded.adventure</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index 0ebb70cab..efe6c80a3 100644
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@@ -57,6 +57,10 @@
                         </goals>
                         <configuration>
                             <relocations>
+                                <relocation>
+                                    <pattern>com.fasterxml.jackson</pattern>
+                                    <shadedPattern>org.geysermc.platform.velocity.shaded.jackson</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>it.unimi.dsi.fastutil</pattern>
                                     <shadedPattern>org.geysermc.platform.velocity.shaded.fastutil</shadedPattern>
@@ -65,6 +69,18 @@
                                     <pattern>org.reflections</pattern>
                                     <shadedPattern>org.geysermc.platform.velocity.shaded.reflections</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.google.guava</pattern>
+                                    <shadedPattern>org.geysermc.platform.velocity.shaded.guava</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.dom4j</pattern>
+                                    <shadedPattern>org.geysermc.platform.velocity.shaded.dom4j</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>net.kyori.adventure</pattern>
+                                    <shadedPattern>org.geysermc.platform.velocity.shaded.adventure</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
diff --git a/connector/pom.xml b/connector/pom.xml
index 76a83c23f..fe35b6782 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -137,21 +137,21 @@
             <version>2.1.3</version>
         </dependency>
         <dependency>
-            <groupId>net.kyori</groupId>
+            <groupId>com.github.kyoripowered.adventure</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>557865caef</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.kyori</groupId>
+            <groupId>com.github.kyoripowered.adventure</groupId>
             <artifactId>adventure-text-serializer-gson</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>557865caef</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.kyori</groupId>
+            <groupId>com.github.kyoripowered.adventure</groupId>
             <artifactId>adventure-text-serializer-legacy</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>557865caef</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>