From 415e43885c4884216813a657beef1c17575202fc Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Fri, 8 Aug 2014 15:25:21 +0200
Subject: [PATCH] Consistently use version 2.3 of maven-shade-plugin.

---
 core/pom.xml   | 3 +--
 orchid/pom.xml | 5 ++++-
 pom.xml        | 4 ++++
 tools/pom.xml  | 1 -
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 2adf3fe20..f0f204a70 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -166,7 +166,7 @@
                                         <urn>org.apache.maven.plugins:maven-install-plugin:2.5.1:maven-plugin:null:runtime:b6f5a4b621b9c26699c8deadb20fdc35ce568e35</urn>
                                         <urn>org.apache.maven.plugins:maven-jar-plugin:2.5:maven-plugin:null:runtime:344d667f5ec8b90d03d698d096a1147672fc522f</urn>
                                         <urn>org.apache.maven.plugins:maven-resources-plugin:2.6:maven-plugin:null:runtime:dd093ff6a4b680eae7ae83b5ab04310249fc6590</urn>
-                                        <urn>org.apache.maven.plugins:maven-shade-plugin:1.6:maven-plugin:null:runtime:cd862864faa26636c013a21a79bbc57c8bcc1cf4</urn>
+                                        <urn>org.apache.maven.plugins:maven-shade-plugin:2.3:maven-plugin:null:runtime:d136adc7abccc9c12adcad6ae7a9bc51b2b7184b</urn>
                                         <urn>org.apache.maven.plugins:maven-site-plugin:3.3:maven-plugin:null:runtime:77ba1752b1ac4c4339d6f11554800960a56a4ae1</urn>
                                         <urn>org.apache.maven.plugins:maven-source-plugin:2.1.2:maven-plugin:null:runtime:35154aa8e6e0e84c2b5c10c3d5220d65670ba984</urn>
                                         <urn>org.apache.maven.plugins:maven-surefire-plugin:2.12.4:maven-plugin:null:runtime:2b435f7f77777d2e62354fdc690da3f1dc47a26b</urn>
@@ -199,7 +199,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
                 <executions>
                     <!-- Create the bundled JAR, it's easier for some people -->
                     <execution>
diff --git a/orchid/pom.xml b/orchid/pom.xml
index 6927519f3..6a719f94e 100644
--- a/orchid/pom.xml
+++ b/orchid/pom.xml
@@ -55,7 +55,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.6</version>
                 <configuration>
                     <minimizeJar>false</minimizeJar>
                     <filters>
@@ -111,6 +110,10 @@
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>2.6</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>2.3</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
diff --git a/pom.xml b/pom.xml
index 2edb00ce0..868d71146 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,10 @@
           <artifactId>maven-resources-plugin</artifactId>
           <version>2.6</version>
         </plugin>
+        <plugin>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
diff --git a/tools/pom.xml b/tools/pom.xml
index 3c4d12462..b3876ca16 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -38,7 +38,6 @@
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-shade-plugin</artifactId>
-              <version>1.6</version>
               <configuration>
                   <!-- Remove dead classes -->
                   <minimizeJar>true</minimizeJar>