Upstream merge: conflict resolution and version bump

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

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,31 +1,23 @@
-From 0583597f21e65ab38ab36899f99299a6463a1735 Mon Sep 17 00:00:00 2001
+From a7344d5de1c9952cf0e2c9e27a3a5f3283289a53 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 84a00a3..607be4e 100644
+index b4b7ae0..006d26b 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1,12 +1,20 @@
+@@ -1,12 +1,12 @@
  <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>
-+
-+  <parent>
-+    <groupId>org.spigotmc</groupId>
-+    <artifactId>spigot-parent</artifactId>
-+    <version>dev-SNAPSHOT</version>
-+    <relativePath>../pom.xml</relativePath>
-+  </parent>
-+
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.7.9-R0.1-SNAPSHOT</version>
+   <version>1.7.9-R0.2-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>
@@ -33,7 +25,7 @@ index 84a00a3..607be4e 100644
  
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -18,25 +26,6 @@
+@@ -18,24 +18,12 @@
      <buildtag.suffix></buildtag.suffix>
    </properties>
  
@@ -55,11 +47,16 @@ index 84a00a3..607be4e 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>
+ 
    <repositories>
      <repository>
-       <id>repobo-snap</id>
-@@ -53,8 +42,8 @@
+@@ -53,8 +41,8 @@
  
    <dependencies>
      <dependency>
@@ -70,7 +67,7 @@ index 84a00a3..607be4e 100644
        <version>${project.version}</version>
        <type>jar</type>
        <scope>compile</scope>
-@@ -107,33 +96,6 @@
+@@ -107,33 +95,6 @@
        <artifactId>gson</artifactId>
        <version>2.1</version>
      </dependency>
@@ -104,7 +101,7 @@ index 84a00a3..607be4e 100644
      <!-- testing -->
      <dependency>
        <groupId>junit</groupId>
-@@ -147,19 +109,24 @@
+@@ -147,19 +108,24 @@
        <version>1.3</version>
        <scope>test</scope>
      </dependency>
@@ -132,7 +129,7 @@ index 84a00a3..607be4e 100644
          </configuration>
          <executions>
            <execution>
-@@ -212,7 +179,7 @@
+@@ -212,7 +178,7 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-shade-plugin</artifactId>