From 4c58568eb411cc4a83bc772148f7f5956de68d9b Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
Date: Wed, 2 Sep 2020 23:42:53 -0400
Subject: [PATCH] Relocate Google Common (#1242)
Fixes NoSuchMethodErrors from occuring on certain Spigot servers.
---
bootstrap/bungeecord/pom.xml | 6 +++++-
bootstrap/spigot/pom.xml | 6 +++++-
bootstrap/sponge/pom.xml | 6 +++++-
bootstrap/velocity/pom.xml | 6 +++++-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 3fb7090f8..44b28e931 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -73,9 +73,13 @@
org.reflections
org.geysermc.platform.bungeecord.shaded.reflections
+
+ com.google.common
+ org.geysermc.platform.bungeecord.shaded.google.common
+
com.google.guava
- org.geysermc.platform.bungeecord.shaded.guava
+ org.geysermc.platform.bungeecord.shaded.google.guava
org.dom4j
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index 79bdfea01..194ec6e5a 100644
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@@ -79,9 +79,13 @@
org.reflections
org.geysermc.platform.spigot.shaded.reflections
+
+ com.google.common
+ org.geysermc.platform.spigot.shaded.google.common
+
com.google.guava
- org.geysermc.platform.spigot.shaded.guava
+ org.geysermc.platform.spigot.shaded.google.guava
org.dom4j
diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
index 3c20239f1..132f38173 100644
--- a/bootstrap/sponge/pom.xml
+++ b/bootstrap/sponge/pom.xml
@@ -73,9 +73,13 @@
org.reflections
org.geysermc.platform.sponge.shaded.reflections
+
+ com.google.common
+ org.geysermc.platform.sponge.shaded.google.common
+
com.google.guava
- org.geysermc.platform.sponge.shaded.guava
+ org.geysermc.platform.sponge.shaded.google.guava
org.dom4j
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index efe6c80a3..ee445b6e7 100644
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@@ -69,9 +69,13 @@
org.reflections
org.geysermc.platform.velocity.shaded.reflections
+
+ com.google.common
+ org.geysermc.platform.velocity.shaded.google.common
+
com.google.guava
- org.geysermc.platform.velocity.shaded.guava
+ org.geysermc.platform.velocity.shaded.google.guava
org.dom4j