Upstream merge.

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,40 +1,33 @@
-From e6075fce1256fa944083c6cde3b1e47fac360979 Mon Sep 17 00:00:00 2001
+From e17c2827099e58c8f95512ba2e9c71e594a9929b 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 f1efef0..7073202 100644
+index 4d5a7cf..2122a38 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1,15 +1,22 @@
- <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>
+@@ -9,14 +9,14 @@
+         <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>
 -- 
 2.1.0