[maven-shade-plugin] Migration to plexus-containers-component-metadata
Jaromír Cápík
jcapik at fedoraproject.org
Mon Mar 5 11:51:55 UTC 2012
commit dbcc4f4915705d20b80b825d81a975e25377810d
Author: Jaromir Capik <jcapik at redhat.com>
Date: Mon Mar 5 12:51:35 2012 +0100
Migration to plexus-containers-component-metadata
...de-plugin-migration-to-component-metadata.patch | 18 ++++++++++++++++++
maven-shade-plugin.spec | 11 ++++++++++-
2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/maven-shade-plugin-migration-to-component-metadata.patch b/maven-shade-plugin-migration-to-component-metadata.patch
new file mode 100644
index 0000000..f79f526
--- /dev/null
+++ b/maven-shade-plugin-migration-to-component-metadata.patch
@@ -0,0 +1,18 @@
+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 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.3.8</version>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec
index bf50dea..75b09ff 100644
--- a/maven-shade-plugin.spec
+++ b/maven-shade-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-shade-plugin
Version: 1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: This plugin provides the capability to package the artifact in an uber-jar
Group: Development/Libraries
@@ -8,6 +8,8 @@ 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
+Patch0: %{name}-migration-to-component-metadata.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -18,6 +20,7 @@ BuildRequires: maven
BuildRequires: maven-wagon
BuildRequires: maven-enforcer-plugin
BuildRequires: plexus-container-default
+BuildRequires: plexus-containers-component-metadata
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
@@ -53,6 +56,9 @@ Requires: jpackage-utils
%prep
%setup -q
+
+%patch0 -p1
+
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
@@ -84,6 +90,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%doc LICENSE
%changelog
+* Mon Mar 05 2012 Jaromir Capik <jcapik at redhat.com> - 1.5-4
+- Migration to plexus-containers-component-metadata
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list