Migration to plexus-containers-component-metadata

This commit is contained in:
Jaromir Capik 2012-03-05 12:51:35 +01:00
parent e4c54e2aac
commit 68a54e1c11
2 changed files with 28 additions and 1 deletions

View File

@ -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>

View File

@ -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@redhat.com> - 1.5-4
- Migration to plexus-containers-component-metadata
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild