From f2bf62789df5c1b590e0cc7bcb615a3aeecc26bb Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 5 Jan 2015 14:32:01 +1100
Subject: [PATCH] Upstream merge.

---
 Bukkit-Patches/0001-POM-Changes.patch         | 27 +++++++------------
 Bukkit-Patches/0029-BungeeCord-Chat-API.patch |  7 ++---
 CraftBukkit-Patches/0001-POM-Changes.patch    |  2 +-
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch
index 93507f7c7..2d0e155d4 100644
--- a/Bukkit-Patches/0001-POM-Changes.patch
+++ b/Bukkit-Patches/0001-POM-Changes.patch
@@ -9,30 +9,23 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/pom.xml
 +++ 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>
+         <version>9</version>
+     </parent>
+ 
 -    <groupId>org.bukkit</groupId>
 -    <artifactId>bukkit</artifactId>
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
      <version>1.8-R0.1-SNAPSHOT</version>
+     <packaging>jar</packaging>
+ 
 -    <name>Bukkit</name>
--    <url>http://www.bukkit.org</url>
+-    <url>http://www.bukkit.org/</url>
+-    <description>A plugin API for Minecraft servers.</description>
 +    <name>Spigot-API</name>
-+    <url>http://www.spigotmc.org</url>
++    <url>http://www.spigotmc.org/</url>
++    <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     </properties>
- 
-+    <repositories>
-+        <repository>
-+            <id>sonatype-snapshots</id>
-+            <url>https://oss.sonatype.org/content/repositories/public</url>
-+        </repository>
-+    </repositories>
-+
-     <distributionManagement>
-         <repository>
-             <id>spigotmc-releases</id>
+         <maven.compiler.source>1.6</maven.compiler.source>
 --
\ No newline at end of file
diff --git a/Bukkit-Patches/0029-BungeeCord-Chat-API.patch b/Bukkit-Patches/0029-BungeeCord-Chat-API.patch
index d01301339..80ac2de5e 100644
--- a/Bukkit-Patches/0029-BungeeCord-Chat-API.patch
+++ b/Bukkit-Patches/0029-BungeeCord-Chat-API.patch
@@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
-             <artifactId>commons-lang</artifactId>
-             <version>2.6</version>
+             <version>1.14</version>
+             <scope>compile</scope>
          </dependency>
 +        <dependency>
 +            <groupId>net.md-5</groupId>
@@ -19,9 +19,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            <type>jar</type>
 +            <scope>compile</scope>
 +        </dependency>
- 
++
          <!-- testing -->
          <dependency>
+             <groupId>junit</groupId>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/Server.java
diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
index 243a41077..233d5a3e5 100644
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 @@ -0,0 +0,0 @@
-     <buildtag.suffix></buildtag.suffix>
+     <maven.compiler.target>1.6</maven.compiler.target>
    </properties>
  
 +  <parent>