From 3c15908aacd8e82f68f11ec072672b29c6744515 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Mon, 16 Mar 2015 10:19:21 +0000
Subject: [PATCH] Upstream merge

---
 CraftBukkit-Patches/0001-POM-Changes.patch | 177 ++++++++++-----------
 1 file changed, 81 insertions(+), 96 deletions(-)

diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
index 5d4d5e2747..02e4efd8a0 100644
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -11,107 +11,92 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-   <modelVersion>4.0.0</modelVersion>
--  <groupId>org.bukkit</groupId>
--  <artifactId>craftbukkit</artifactId>
-+  <groupId>org.spigotmc</groupId>
-+  <artifactId>spigot</artifactId>
-   <packaging>jar</packaging>
-   <version>1.8.3-R0.1-SNAPSHOT</version>
--  <name>CraftBukkit</name>
--  <url>http://www.bukkit.org</url>
-+  <name>Spigot</name>
-+  <url>http://www.spigotmc.org</url>
- 
-   <properties>
-     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -0,0 +0,0 @@
-     <maven.compiler.target>1.6</maven.compiler.target>
-   </properties>
- 
-+  <parent>
+          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+     <modelVersion>4.0.0</modelVersion>
+-    <groupId>org.bukkit</groupId>
+-    <artifactId>craftbukkit</artifactId>
 +    <groupId>org.spigotmc</groupId>
-+    <artifactId>spigot-parent</artifactId>
-+    <version>dev-SNAPSHOT</version>
-+    <relativePath>../pom.xml</relativePath>
-+  </parent>
++    <artifactId>spigot</artifactId>
+     <packaging>jar</packaging>
+     <version>1.8.3-R0.1-SNAPSHOT</version>
+-    <name>CraftBukkit</name>
+-    <url>http://www.bukkit.org</url>
++    <name>Spigot</name>
++    <url>http://www.spigotmc.org</url>
+ 
+     <properties>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+@@ -0,0 +0,0 @@
+         <maven.compiler.target>1.6</maven.compiler.target>
+     </properties>
+ 
++    <parent>
++        <groupId>org.spigotmc</groupId>
++        <artifactId>spigot-parent</artifactId>
++        <version>dev-SNAPSHOT</version>
++        <relativePath>../pom.xml</relativePath>
++    </parent>
 +
-   <dependencies>
-     <dependency>
--      <groupId>org.bukkit</groupId>
--      <artifactId>bukkit</artifactId>
-+        <groupId>net.sf.trove4j</groupId>
-+        <artifactId>trove4j</artifactId>
-+        <version>3.0.3</version>
-+    </dependency>    
-+    <dependency>
-+      <groupId>org.spigotmc</groupId>
-+      <artifactId>spigot-api</artifactId>
-       <version>${project.version}</version>
-       <type>jar</type>
-       <scope>compile</scope>
+     <dependencies>
+         <dependency>
+-            <groupId>org.bukkit</groupId>
+-            <artifactId>bukkit</artifactId>
++            <groupId>net.sf.trove4j</groupId>
++            <artifactId>trove4j</artifactId>
++            <version>3.0.3</version>
++        </dependency>
++        <dependency>
++            <groupId>org.spigotmc</groupId>
++            <artifactId>spigot-api</artifactId>
+             <version>${project.version}</version>
+             <type>jar</type>
+             <scope>compile</scope>
 @@ -0,0 +0,0 @@
  
-   <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
-   <build>
--    <defaultGoal>clean install</defaultGoal>
-+    <defaultGoal>install</defaultGoal>
-     <plugins>
-       <plugin>
-         <groupId>com.lukegb.mojo</groupId>
-         <artifactId>gitdescribe-maven-plugin</artifactId>
-         <version>2.0</version>
-         <configuration>
--          <outputPrefix>${buildtag.prefix}</outputPrefix>
--          <outputPostfix>${buildtag.suffix}</outputPostfix>
-             <extraArguments>
-                 <extraArgument>--always</extraArgument>
-             </extraArguments>
-         </configuration>
-         <executions>
-           <execution>
-+            <id>ex-spigot</id>
-+            <configuration>
-+              <outputPrefix>git-Spigot-</outputPrefix>
-+              <outputPostfix></outputPostfix>
-+              <scmDirectory>../</scmDirectory>
-+              <descriptionProperty>spigot.desc</descriptionProperty>
-+            </configuration>
-+            <phase>compile</phase>
-+            <goals>
-+              <goal>gitdescribe</goal>
-+            </goals>
-+          </execution>
-+          <execution>
-+            <id>ex-craftbukkit</id>
-+            <configuration>
-+              <outputPrefix>-</outputPrefix>
-+              <outputPostfix></outputPostfix>
-+              <scmDirectory>../../CraftBukkit</scmDirectory>
-+              <descriptionProperty>craftbukkit.desc</descriptionProperty>
-+            </configuration>
-             <phase>compile</phase>
-             <goals>
-               <goal>gitdescribe</goal>
+     <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
+     <build>
+-        <defaultGoal>clean install</defaultGoal>
++        <defaultGoal>install</defaultGoal>
+         <plugins>
+             <plugin>
+                 <groupId>net.md-5</groupId>
+                 <artifactId>scriptus</artifactId>
+                 <version>0.2</version>
+-                <configuration>
+-                    <format>git-Bukkit-%s</format>
+-                </configuration>
+                 <executions>
+                     <execution>
++                        <id>ex-spigot</id>
++                        <configuration>
++                            <format>git-Spigot-%s</format>
++                            <scmDirectory>../</scmDirectory>
++                            <descriptionProperty>spigot.desc</descriptionProperty>
++                        </configuration>
++                        <phase>initialize</phase>
++                        <goals>
++                            <goal>describe</goal>
++                        </goals>
++                    </execution>
++                    <execution>
++                        <id>ex-craftbukkit</id>
++                        <configuration>
++                            <format>-%s</format>
++                            <scmDirectory>../../CraftBukkit</scmDirectory>
++                            <descriptionProperty>craftbukkit.desc</descriptionProperty>
++                        </configuration>
+                         <phase>initialize</phase>
+                         <goals>
+                             <goal>describe</goal>
 @@ -0,0 +0,0 @@
-             <manifestEntries>
-               <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
-               <Implementation-Title>CraftBukkit</Implementation-Title>
--              <Implementation-Version>${describe}</Implementation-Version>
-+              <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
-               <Implementation-Vendor>Bukkit Team</Implementation-Vendor>
-               <Specification-Title>Bukkit</Specification-Title>
-               <Specification-Version>${api.version}</Specification-Version>
-@@ -0,0 +0,0 @@
-           <configuration>
-               <signature>
-                   <groupId>org.codehaus.mojo.signature</groupId>
--                  <artifactId>java16</artifactId>
-+                  <artifactId>java16-sun</artifactId>
-                   <version>1.1</version>
-               </signature>
-           </configuration>
+                         <manifestEntries>
+                             <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
+                             <Implementation-Title>CraftBukkit</Implementation-Title>
+-                            <Implementation-Version>${describe}</Implementation-Version>
++                            <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
+                             <Implementation-Vendor>Bukkit Team</Implementation-Vendor>
+                             <Specification-Title>Bukkit</Specification-Title>
+                             <Specification-Version>${api.version}</Specification-Version>
 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