From 752833e5ce8c99f5d8f28c96bd6fc23616485218 Mon Sep 17 00:00:00 2001
From: Tomas Radej <tradej@redhat.com>
Date: Wed, 12 Sep 2012 09:40:11 +0200
Subject: [PATCH] Updated to v2.0

---
 .gitignore              |  1 +
 maven-shade-plugin.spec | 12 ++++++++----
 sources                 |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9e99b36..f303a78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ maven-shade-plugin-1.5-source-release.zip
 maven-shade-plugin-1.6-source-release.zip
 /maven-shade-plugin-1.7-source-release.zip
 maven-shade-plugin-1.7.1-source-release.zip
+/maven-shade-plugin-2.0-source-release.zip
diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec
index bc7e3a8..70fe279 100644
--- a/maven-shade-plugin.spec
+++ b/maven-shade-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-shade-plugin
-Version:        1.7.1
-Release:        3%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        This plugin provides the capability to package the artifact in an uber-jar
 
 Group:          Development/Libraries
@@ -59,7 +59,8 @@ 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
 
 %build
-mvn-rpmbuild install javadoc:javadoc
+# A class from aopalliance is not found. Simply adding BR does not solve it
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip
 
 %install
 # jars
@@ -68,7 +69,7 @@ install -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}
 # poms
 install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap
 
 # javadoc
 install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -86,6 +87,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %doc LICENSE NOTICE
 
 %changelog
+* Thu Dec 13 2012 Tomas Radej <tradej@redhat.com> - 2.0-1
+- Update to upstream 2.0
+
 * Wed Nov 14 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.1-3
 - Install NOTICE file with javadoc package
 
diff --git a/sources b/sources
index fe0723f..767ecec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4596ac24c0c2b841f7bf81c36048732  maven-shade-plugin-1.7.1-source-release.zip
+f9956b4af523b57ee903d026b8ca5da6  maven-shade-plugin-2.0-source-release.zip