Update from upstream SpigotMC take 2: Update harder

This commit is contained in:
Zach Brown
2014-12-27 16:07:04 -06:00
parent 4832a37296
commit 105e5e9ba4
5 changed files with 39 additions and 27 deletions

View File

@@ -98,15 +98,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<Implementation-Vendor>Bukkit Team</Implementation-Vendor>
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
@@ -0,0 +0,0 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
+ <version>2.1</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java