From a6f60283d4f596570ae13fa9c31fce1833e3b9a0 Mon Sep 17 00:00:00 2001
From: Spigot <noreply+git-spigot@papermc.io>
Date: Sun, 3 Feb 2013 09:48:23 +1100
Subject: [PATCH] Just use the parent pom.

By: md_5 <md_5@live.com.au>
---
 Bukkit-Patches/0001-Spigot-POM-Changes.patch | 46 ++++++++++----------
 CraftBukkit-Patches/0001-POM-Changes.patch   | 43 +++++++++---------
 pom.xml                                      | 11 +++++
 3 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/Bukkit-Patches/0001-Spigot-POM-Changes.patch b/Bukkit-Patches/0001-Spigot-POM-Changes.patch
index e921a352f9..7e7b22fbfb 100644
--- a/Bukkit-Patches/0001-Spigot-POM-Changes.patch
+++ b/Bukkit-Patches/0001-Spigot-POM-Changes.patch
@@ -1,17 +1,17 @@
-From 1b48da0399fbc347ad1ccd1b2ed0d079247e9cde Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@live.com.au>
-Date: Sun, 3 Feb 2013 09:32:19 +1100
-Subject: [PATCH] Spigot POM Changes
+From adc1a050f272a44a702f9334e33ee8e7126a679a Mon Sep 17 00:00:00 2001
+From: EvilSeph <evilseph@gmail.com>
+Date: Wed, 30 Jan 2013 23:44:29 -0500
+Subject: [PATCH] Spigot POM Changes.
 
 ---
- pom.xml | 30 +++++++++---------------------
- 1 file changed, 9 insertions(+), 21 deletions(-)
+ pom.xml | 36 ++++--------------------------------
+ 1 file changed, 4 insertions(+), 32 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 18bda4b..46b6157 100644
+index 18bda4b..b531cec 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1,40 +1,28 @@
+@@ -1,43 +1,15 @@
  <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>
@@ -34,33 +34,31 @@ index 18bda4b..46b6157 100644
 -        <url>https://github.com/Bukkit/Bukkit/tree/master/</url>
 -    </scm>
 -
-     <ciManagement>
-         <system>jenkins</system>
+-    <ciManagement>
+-        <system>jenkins</system>
 -        <url>http://ci.bukkit.org</url>
-+        <url>http://ci.md-5.net/job/Spigot-API</url>
-     </ciManagement>
- 
-     <distributionManagement>
+-    </ciManagement>
+-
+-    <distributionManagement>
 -        <site>
 -            <id>jd.bukkit.org</id>
 -            <url>file:///home/javadocs/public_html/</url>
 -        </site>
-         <repository>
+-        <repository>
 -            <id>repobo-rel</id>
 -            <name>repo.bukkit.org Releases</name>
 -            <url>http://repo.bukkit.org/content/repositories/releases/</url>
-+            <id>md_5-releases</id>
-+            <url>http://repo.md-5.net/content/repositories/releases/</url>
-         </repository>
-         <snapshotRepository>
+-        </repository>
+-        <snapshotRepository>
 -            <id>repobo-snap</id>
 -            <name>repo.bukkit.org Snapshots</name>
 -            <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
-+            <id>md_5-snapshots</id>
-+            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
-         </snapshotRepository>
-     </distributionManagement>
- 
+-        </snapshotRepository>
+-    </distributionManagement>
+-
+     <build>
+         <plugins>
+             <plugin>
 -- 
 1.8.1-rc2
 
diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
index a5aa59679a..e1ad5d2b72 100644
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -1,14 +1,14 @@
-From 90c154d7287ae9c3480f31c4b0d56c33b7a1dba4 Mon Sep 17 00:00:00 2001
+From 4cbb6243977214e595efa83ba0445c571dcb303b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
-Date: Sun, 3 Feb 2013 09:37:03 +1100
+Date: Sun, 3 Feb 2013 09:44:24 +1100
 Subject: [PATCH] POM Changes.
 
 ---
- pom.xml | 43 +++++++++++++++++--------------------------
- 1 file changed, 17 insertions(+), 26 deletions(-)
+ pom.xml | 47 +++++++++++++----------------------------------
+ 1 file changed, 13 insertions(+), 34 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index d697ca1..5704b92 100644
+index d697ca1..5a1a5dd 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -28,7 +28,7 @@ index d697ca1..5704b92 100644
  
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -16,22 +16,15 @@
+@@ -16,25 +16,6 @@
      <minecraft_version>1_4_R1</minecraft_version>
    </properties>
  
@@ -37,25 +37,24 @@ index d697ca1..5704b92 100644
 -    <developerConnection>scm:git:ssh://git@github.com/Bukkit/CraftBukkit.git</developerConnection>
 -    <url>https://github.com/Bukkit/CraftBukkit</url>
 -  </scm>
- 
-   <distributionManagement>
-     <repository>
+-
+-  <distributionManagement>
+-    <repository>
 -      <id>repobo-rel</id>
 -      <name>repo.bukkit.org Releases</name>
 -      <url>http://repo.bukkit.org/content/repositories/releases/</url>
-+      <id>md_5-releases</id>
-+      <url>http://repo.md-5.net/content/repositories/releases/</url>
-     </repository>
-     <snapshotRepository>
+-    </repository>
+-    <snapshotRepository>
 -      <id>repobo-snap</id>
 -      <name>repo.bukkit.org Snapshots</name>
 -      <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
-+      <id>md_5-snapshots</id>
-+      <url>http://repo.md-5.net/content/repositories/snapshots/</url>
-     </snapshotRepository>
-   </distributionManagement>
- 
-@@ -42,17 +35,10 @@
+-    </snapshotRepository>
+-  </distributionManagement>
+-
+   <repositories>
+     <repository>
+       <id>repobo-snap</id>
+@@ -42,17 +23,10 @@
      </repository>
    </repositories>
  
@@ -75,7 +74,7 @@ index d697ca1..5704b92 100644
        <version>${project.version}</version>
        <type>jar</type>
        <scope>compile</scope>
-@@ -145,6 +131,11 @@
+@@ -145,6 +119,11 @@
        <version>1.3</version>
        <scope>test</scope>
      </dependency>
@@ -87,7 +86,7 @@ index d697ca1..5704b92 100644
    </dependencies>
  
    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
-@@ -156,7 +147,7 @@
+@@ -156,7 +135,7 @@
          <artifactId>gitdescribe-maven-plugin</artifactId>
          <version>1.3</version>
          <configuration>
@@ -96,7 +95,7 @@ index d697ca1..5704b92 100644
            <outputPostfix></outputPostfix>
          </configuration>
          <executions>
-@@ -210,7 +201,7 @@
+@@ -210,7 +189,7 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-shade-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 75eafef573..aa9dd7cfea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,4 +20,15 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
+    <distributionManagement>
+        <repository>
+            <id>md_5-releases</id>
+            <url>http://repo.md-5.net/content/repositories/releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>md_5-snapshots</id>
+            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
 </project>