diff --git a/pom.xml b/pom.xml
index e53d470e9..cd3fddb4a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
com.gmail.nossr50.mcMMO
mcMMO
- 2.1.196
+ 2.1.197-SNAPSHOT
mcMMO
https://github.com/mcMMO-Dev/mcMMO
@@ -145,11 +145,10 @@
co.aikar:acf-bukkit
-
net.kyori.examination
- com.gmail.nossr50.kyori.examination
+ com.gmail.nossr50.mcmmo.kyori.examination
net.kyori.adventure
@@ -223,24 +222,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
- com.github.seeseemelk
- MockBukkit-v1.16
- 0.25.0
- test
-
+
+
+
+
+
+
co.aikar
acf-bukkit
@@ -313,7 +301,7 @@
com.sk89q.worldguard
worldguard-core
- 7.0.1-SNAPSHOT
+ 7.0.4
@@ -337,13 +325,13 @@
org.junit.jupiter
junit-jupiter-api
- 5.7.1
+ 5.8.0-M1
test
org.junit.jupiter
junit-jupiter-engine
- 5.7.1
+ 5.8.0-M1
test
@@ -355,31 +343,37 @@
org.powermock
powermock-module-junit4
- 2.0.7
+ 2.0.9
test
org.powermock
powermock-api-mockito2
- 2.0.7
+ 2.0.9
test
org.mockito
mockito-core
- 3.8.0
+ 3.9.0
test
org.apache.tomcat
tomcat-jdbc
- 7.0.52
+ 10.0.5
compile
org.jetbrains
annotations
- 19.0.0
+ 20.1.0
+
+
+ com.google.guava
+ guava
+ 29.0-jre
+ compile
diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillTools.java b/src/main/java/com/gmail/nossr50/util/skills/SkillTools.java
index 8d50873c5..c8f88e65f 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/SkillTools.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/SkillTools.java
@@ -10,7 +10,6 @@ import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.text.StringUtils;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -18,6 +17,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Tameable;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.VisibleForTesting;
import java.util.*;
diff --git a/src/test/java/com/gmail/nossr50/TestUtil.java b/src/test/java/com/gmail/nossr50/TestUtil.java
deleted file mode 100644
index 341bf4fc0..000000000
--- a/src/test/java/com/gmail/nossr50/TestUtil.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.gmail.nossr50;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-
-//TODO: Move generic test stuff here
-public class TestUtil {
- public static void recursiveDelete(@NotNull File directoryToBeDeleted) {
- if (directoryToBeDeleted.isDirectory()) {
- for (File file : directoryToBeDeleted.listFiles()) {
- recursiveDelete(file);
- }
- }
- directoryToBeDeleted.delete();
- }
-}
diff --git a/src/test/java/com/gmail/nossr50/database/FlatFileDatabaseManagerTest.java b/src/test/java/com/gmail/nossr50/database/FlatFileDatabaseManagerTest.java
index 17183de34..cd1cd6f54 100644
--- a/src/test/java/com/gmail/nossr50/database/FlatFileDatabaseManagerTest.java
+++ b/src/test/java/com/gmail/nossr50/database/FlatFileDatabaseManagerTest.java
@@ -1,6 +1,5 @@
package com.gmail.nossr50.database;
-import com.gmail.nossr50.TestUtil;
import com.gmail.nossr50.database.flatfile.LeaderboardStatus;
import com.gmail.nossr50.datatypes.database.DatabaseType;
import com.gmail.nossr50.datatypes.player.PlayerProfile;
@@ -86,7 +85,7 @@ public class FlatFileDatabaseManagerTest {
@AfterEach
public void tearDown() {
- TestUtil.recursiveDelete(tempDir);
+ recursiveDelete(tempDir);
db = null;
}
@@ -844,4 +843,14 @@ public class FlatFileDatabaseManagerTest {
return false;
}
}
+
+ public static void recursiveDelete(@NotNull File directoryToBeDeleted) {
+ if (directoryToBeDeleted.isDirectory()) {
+ for (File file : directoryToBeDeleted.listFiles()) {
+ recursiveDelete(file);
+ }
+ }
+ directoryToBeDeleted.delete();
+ }
+
}
\ No newline at end of file
diff --git a/src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java b/src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java
index 6b2236e69..774b55f8d 100644
--- a/src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java
+++ b/src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java
@@ -1,6 +1,5 @@
package com.gmail.nossr50.util.blockmeta;
-import com.gmail.nossr50.TestUtil;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.BlockUtils;
import com.gmail.nossr50.util.compat.CompatibilityManager;
@@ -40,7 +39,7 @@ public class ChunkStoreTest {
@AfterClass
public static void tearDownClass() {
- TestUtil.recursiveDelete(tempDir);
+ recursiveDelete(tempDir);
}
private World mockWorld;
@@ -440,4 +439,13 @@ public class ChunkStoreTest {
Mockito.when(testBlock.getWorld()).thenReturn(mockWorld);
return testBlock;
}
+
+ public static void recursiveDelete(@NotNull File directoryToBeDeleted) {
+ if (directoryToBeDeleted.isDirectory()) {
+ for (File file : directoryToBeDeleted.listFiles()) {
+ recursiveDelete(file);
+ }
+ }
+ directoryToBeDeleted.delete();
+ }
}