From 31572d6c205a3db85c2fafb73dca9e0064eb0e32 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 3 Dec 2013 08:21:58 +1100
Subject: [PATCH] Update maven shade plugin so that newer maven versions (ie
 travis) will compile.

---
 Bukkit-Patches/0001-POM-Changes.patch      | 13 +++++++++++--
 CraftBukkit-Patches/0001-POM-Changes.patch |  6 +++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch
index 451862f..ed774a6 100644
--- a/Bukkit-Patches/0001-POM-Changes.patch
+++ b/Bukkit-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From 2bb359a6e5b56a5e53f765efa8aea93c2db727fb Mon Sep 17 00:00:00 2001
+From 3ab78de5ed40a1b0368005186ae44885139aff05 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 a83e578..e1f4e61 100644
+index a83e578..718a2f6 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,43 +1,23 @@
@@ -64,6 +64,15 @@ index a83e578..e1f4e61 100644
      <build>
          <plugins>
              <plugin>
+@@ -52,7 +32,7 @@
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+-                <version>1.4</version>
++                <version>2.1</version>
+                 <executions>
+                     <execution>
+                         <phase>package</phase>
 -- 
 1.8.3.2
 
diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
index d3136f6..9c77ee6 100644
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From ea9533f887254b6ec417d9e69a0eb81b9676c7ad Mon Sep 17 00:00:00 2001
+From 4b914f695027412127875091a38d36fbddc46a07 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 2afdff4..a77fec8 100644
+index 2afdff4..fb6b5c4 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -137,7 +137,7 @@ index 2afdff4..a77fec8 100644
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-shade-plugin</artifactId>
 -        <version>1.4</version>
-+        <version>2.0</version>
++        <version>2.1</version>
          <executions>
            <execution>
              <phase>package</phase>