From 1124e8d43159446b193c902fdf3ea9486244101d Mon Sep 17 00:00:00 2001
From: chickeneer <emcchickeneer@gmail.com>
Date: Tue, 21 Dec 2021 12:27:43 -0600
Subject: [PATCH] Update various dependencies

---
 brigadier/pom.xml                                  |  2 +-
 bungee/pom.xml                                     |  2 +-
 .../co/aikar/commands/BungeeCommandContexts.java   | 10 +++++++++-
 core/pom.xml                                       |  2 +-
 paper/pom.xml                                      |  6 ------
 pom.xml                                            | 14 +++++++-------
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/brigadier/pom.xml b/brigadier/pom.xml
index 861c3f7d..ee5efeee 100644
--- a/brigadier/pom.xml
+++ b/brigadier/pom.xml
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>brigadier</artifactId>
-            <version>1.0.17</version>
+            <version>1.0.18</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/bungee/pom.xml b/bungee/pom.xml
index fb1bc099..d6fd4b99 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.13-SNAPSHOT</version>
+            <version>1.18-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java b/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java
index 93a55c94..6ee74722 100644
--- a/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java
+++ b/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java
@@ -65,7 +65,15 @@ public class BungeeCommandContexts extends CommandContexts<BungeeCommandExecutio
                 colors = colors.filter(color -> finalFilter.equals(ACFUtil.simplifyString(color.name())));
             }
 
-            ChatColor match = ACFUtil.simpleMatch(ChatColor.class, first);
+            ChatColor match = null;
+            String simplified = ACFUtil.simplifyString(first);
+            for (ChatColor chatColor : ChatColor.values()) {
+                String simple = ACFUtil.simplifyString(chatColor.name());
+                if (simplified.equals(simple)) {
+                    match = chatColor;
+                    break;
+                }
+            }
             if (match == null) {
                 String valid = colors
                         .map(color -> "<c2>" + ACFUtil.simplifyString(color.name()) + "</c2>")
diff --git a/core/pom.xml b/core/pom.xml
index 2ea9a4fe..c741cdea 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>net.jodah</groupId>
             <artifactId>expiringmap</artifactId>
-            <version>0.5.9</version>
+            <version>0.5.10</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/paper/pom.xml b/paper/pom.xml
index 581d04a4..6c324166 100644
--- a/paper/pom.xml
+++ b/paper/pom.xml
@@ -64,11 +64,5 @@
             <version>1.15.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
-            <artifactId>paper-mojangapi</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 56844199..d1a11023 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <junit.version>5.4.0</junit.version>
+        <junit.version>5.8.2</junit.version>
         <junit.platform.version>1.4.0</junit.platform.version>
-        <mockito.version>2.25.1</mockito.version>
+        <mockito.version>4.1.0</mockito.version>
     </properties>
 
     <distributionManagement>
@@ -77,12 +77,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.0.0-M5</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -95,7 +95,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -155,13 +155,13 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>15.0</version>
+            <version>31.0.1-jre</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>15.0</version>
+            <version>23.0.0</version>
             <scope>provided</scope>
         </dependency>