Revert "Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5636)"

This reverts commit 20fc4ab700.

Spigot-API-Patches/0001-POM-changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 0223e94c1243a58955f858c8bf6d5df4ca8cf0ec..fd663f5471516c3ebbab07c27197e5df48c481e6 100644
+index 5f3253b9c4a533e746707d602d4a7988519742ef..61b8ee4e3e122dd2671f50ea3b432e4abd4600a2 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -2,33 +2,34 @@
@@ -77,7 +77,7 @@ index 0223e94c1243a58955f858c8bf6d5df4ca8cf0ec..fd663f5471516c3ebbab07c27197e5df
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -112,6 +127,7 @@
+@@ -93,6 +108,7 @@
      </dependencies>
  
      <build>
@@ -85,7 +85,7 @@ index 0223e94c1243a58955f858c8bf6d5df4ca8cf0ec..fd663f5471516c3ebbab07c27197e5df
          <plugins>
              <plugin>
                  <groupId>net.md-5</groupId>
-@@ -130,10 +146,6 @@
+@@ -111,10 +127,6 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
                  <version>3.8.1</version>
@@ -96,7 +96,7 @@ index 0223e94c1243a58955f858c8bf6d5df4ca8cf0ec..fd663f5471516c3ebbab07c27197e5df
                  <dependencies>
                      <dependency>
                          <groupId>org.codehaus.plexus</groupId>
-@@ -183,6 +195,7 @@
+@@ -164,6 +176,7 @@
                              </excludes>
                          </filter>
                      </filters>