Upstream merge: conflict resolution and version bump

By: md_5 <git@md-5.net>

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,29 +1,21 @@
-From 168645b6eec4fbdde9ca863f240fecdf9f63ca4c Mon Sep 17 00:00:00 2001
+From 08a077bcb805a326ab9197a5814d2a9a54762c90 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index feac8db..aa8a63d 100644
+index 23b7cc3..b394a33 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1,43 +1,23 @@
+@@ -1,42 +1,21 @@
  <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>bukkit</artifactId>
-+
-+    <parent>
-+        <groupId>org.spigotmc</groupId>
-+        <artifactId>spigot-parent</artifactId>
-+        <version>dev-SNAPSHOT</version>
-+        <relativePath>../pom.xml</relativePath>
-+    </parent>
-+
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.7.9-R0.1-SNAPSHOT</version>
+     <version>1.7.9-R0.2-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>
@@ -60,10 +52,15 @@ index feac8db..aa8a63d 100644
 -            <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
 -        </snapshotRepository>
 -    </distributionManagement>
--
++    <parent>
++        <groupId>org.spigotmc</groupId>
++        <artifactId>spigot-parent</artifactId>
++        <version>dev-SNAPSHOT</version>
++        <relativePath>../pom.xml</relativePath>
++    </parent>
+ 
      <build>
          <plugins>
-             <plugin>
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 

Bukkit-Patches/0011-Update-Depends.patch

@@ -1,4 +1,4 @@
-From e8da0323d4163ef96b9be72eabe3d5b730834efd Mon Sep 17 00:00:00 2001
+From b1dcd5bfb51249023019a871be0586f76faf18ba Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 4 Jul 2013 20:05:19 +1000
 Subject: [PATCH] Update Depends
@@ -6,10 +6,10 @@ Subject: [PATCH] Update Depends
 - All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
 
 diff --git a/pom.xml b/pom.xml
-index fb303e2..5187a99 100644
+index b394a33..4252e34 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -77,21 +77,21 @@
+@@ -76,21 +76,21 @@
          <dependency>
              <groupId>org.yaml</groupId>
              <artifactId>snakeyaml</artifactId>
@@ -34,7 +34,7 @@ index fb303e2..5187a99 100644
              <type>jar</type>
              <scope>compile</scope>
          </dependency>
-@@ -105,7 +105,7 @@
+@@ -104,7 +104,7 @@
          <dependency>
              <groupId>commons-lang</groupId>
              <artifactId>commons-lang</artifactId>
@@ -44,5 +44,5 @@ index fb303e2..5187a99 100644
  
          <!-- testing -->
 -- 
-1.8.3.2
+1.9.1