From e216ad83077a8be31987cbd79f64f6dacbbe828e Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 5 Jul 2012 11:31:21 +0300 Subject: [PATCH] Update to upstream 1.7.1. --- .gitignore | 1 + ...lugin-migration-to-component-metadata.patch | 18 ------------------ maven-shade-plugin.spec | 5 ++++- sources | 2 +- 4 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 maven-shade-plugin-migration-to-component-metadata.patch diff --git a/.gitignore b/.gitignore index 6ad482c..9e99b36 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ maven-shade-plugin-1.3.3.tar.xz 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 diff --git a/maven-shade-plugin-migration-to-component-metadata.patch b/maven-shade-plugin-migration-to-component-metadata.patch deleted file mode 100644 index f79f526..0000000 --- a/maven-shade-plugin-migration-to-component-metadata.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur maven-shade-plugin-1.5.orig/pom.xml maven-shade-plugin-1.5/pom.xml ---- maven-shade-plugin-1.5.orig/pom.xml 2011-10-28 19:49:30.000000000 +0200 -+++ maven-shade-plugin-1.5/pom.xml 2012-03-05 11:32:23.678051265 +0100 -@@ -132,12 +132,12 @@ - - - org.codehaus.plexus -- plexus-maven-plugin -+ plexus-component-metadata - 1.3.8 - - - -- descriptor -+ generate-metadata - - - diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec index 616aee1..4ab6090 100644 --- a/maven-shade-plugin.spec +++ b/maven-shade-plugin.spec @@ -1,5 +1,5 @@ Name: maven-shade-plugin -Version: 1.7 +Version: 1.7.1 Release: 1%{?dist} Summary: This plugin provides the capability to package the artifact in an uber-jar @@ -86,6 +86,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ %doc LICENSE %changelog +* Thu Jul 5 2012 Alexander Kurtakov 1.7.1-1 +- Update to upstream 1.7.1. + * Wed Jun 20 2012 Mikolaj Izdebski - 1.7-1 - Update to upstream 1.7 diff --git a/sources b/sources index 5c2c2c5..fe0723f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25f36ebdafda5268bf7cfb5b1c924fda maven-shade-plugin-1.7-source-release.zip +e4596ac24c0c2b841f7bf81c36048732 maven-shade-plugin-1.7.1-source-release.zip