From 94cc47c243c10d2189e5485f181209bbe73003e8 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 12 Jun 2015 07:44:07 +0200
Subject: [PATCH] Update to upstream version 2.4

---
 .gitignore                          |  1 +
 maven-shade-plugin-MSHADE-168.patch | 22 ----------------------
 maven-shade-plugin.spec             | 12 +++++-------
 sources                             |  2 +-
 4 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 maven-shade-plugin-MSHADE-168.patch

diff --git a/.gitignore b/.gitignore
index 380f25c..e06e824 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ maven-shade-plugin-1.7.1-source-release.zip
 /maven-shade-plugin-2.1-source-release.zip
 /maven-shade-plugin-2.2-source-release.zip
 /maven-shade-plugin-2.3-source-release.zip
+/maven-shade-plugin-2.4-source-release.zip
diff --git a/maven-shade-plugin-MSHADE-168.patch b/maven-shade-plugin-MSHADE-168.patch
deleted file mode 100644
index 56ba552..0000000
--- a/maven-shade-plugin-MSHADE-168.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java b/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
-index 644fad6..74bf3b7 100644
---- a/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
-+++ b/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
-@@ -47,7 +47,7 @@ public class ManifestResourceTransformer
-     // Configuration
-     private String mainClass;
- 
--    private Map<String, Attributes> manifestEntries;
-+    private Map<String, String> manifestEntries;
- 
-     // Fields
-     private boolean manifestDiscovered;
-@@ -101,7 +101,7 @@ public class ManifestResourceTransformer
- 
-         if ( manifestEntries != null )
-         {
--            for ( Map.Entry<String, Attributes> entry : manifestEntries.entrySet() )
-+            for ( Map.Entry<String, String> entry : manifestEntries.entrySet() )
-             {
-                 attributes.put( new Attributes.Name( entry.getKey() ), entry.getValue() );
-             }
diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec
index 00d6efd..bc02952 100644
--- a/maven-shade-plugin.spec
+++ b/maven-shade-plugin.spec
@@ -1,16 +1,12 @@
 Name:           maven-shade-plugin
-Version:        2.3
-Release:        5%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 Summary:        This plugin provides the capability to package the artifact in an uber-jar
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/%{name}
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 BuildArch:      noarch
 
-# Fix MSHADE-168 (ManifestResourceTransformer manifestEntries map
-# declares wrong generic type).
-Patch0:         %{name}-MSHADE-168.patch
-
 BuildRequires:  maven-local
 BuildRequires:  java-devel
 BuildRequires:  mvn(asm:asm)
@@ -45,7 +41,6 @@ Summary:        API documentation for %{name}
 %setup -q
 rm src/test/jars/plexus-utils-1.4.1.jar
 ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
-%patch0 -p2
 
 %build
 # A class from aopalliance is not found. Simply adding BR does not solve it
@@ -62,6 +57,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
 %doc LICENSE NOTICE
 
 %changelog
+* Fri Jun 12 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-1
+- Update to upstream version 2.4
+
 * Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-5
 - Remove legacy Obsoletes/Provides for maven2 plugin
 
diff --git a/sources b/sources
index a97daf8..6b8165a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47cc7c4a4710937384012e9640ea3f29  maven-shade-plugin-2.3-source-release.zip
+7e009ef8777212c75616a1a9a95a1f4c  maven-shade-plugin-2.4-source-release.zip