Upstream update

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

@@ -1,11 +1,11 @@
-From 4bbb8c7aa24cea492d251eae531d0d88c1565b94 Mon Sep 17 00:00:00 2001
+From c61566569311803c43acb48153d515d4d9871c53 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index f175b611..2fe7b78e 100644
+index 31b8f93e..360d2f08 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,39 +3,39 @@
@@ -83,8 +83,8 @@ index f175b611..2fe7b78e 100644
      <dependencies>
          <dependency>
              <groupId>commons-lang</groupId>
-@@ -57,6 +68,13 @@
-             <type>jar</type>
+@@ -56,6 +67,13 @@
+             <version>1.1.1</version>
              <scope>compile</scope>
          </dependency>
 +        <!-- bundled with Minecraft, shouldn't ever change -->
@@ -97,7 +97,7 @@ index f175b611..2fe7b78e 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -101,6 +119,7 @@
+@@ -100,6 +118,7 @@
      </dependencies>
  
      <build>
@@ -105,7 +105,7 @@ index f175b611..2fe7b78e 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -120,26 +139,6 @@
+@@ -119,26 +138,6 @@
                  </dependencies>
              </plugin>
              <plugin>
@@ -132,7 +132,7 @@ index f175b611..2fe7b78e 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-shade-plugin</artifactId>
                  <version>3.0.0</version>
-@@ -152,6 +151,7 @@
+@@ -151,6 +150,7 @@
                      </execution>
                  </executions>
                  <configuration>
@@ -141,5 +141,5 @@ index f175b611..2fe7b78e 100644
                      <shadedArtifactAttached>true</shadedArtifactAttached>
                  </configuration>
 -- 
-2.13.4
+2.13.0