[maven-wagon] Migration to plexus-containers-component-metadata
Jaromír Cápík
jcapik at fedoraproject.org
Wed Jul 27 11:31:33 UTC 2011
commit 598d79e7bd5d5d2d7bd98d325d661993e650008d
Author: Jaromir Capik <jcapik at redhat.com>
Date: Wed Jul 27 13:15:00 2011 +0200
Migration to plexus-containers-component-metadata
maven-wagon-migration-to-component-metadata.patch | 28 +++++++++++++++++++++
maven-wagon.spec | 9 +++++-
2 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/maven-wagon-migration-to-component-metadata.patch b/maven-wagon-migration-to-component-metadata.patch
new file mode 100644
index 0000000..ea9f4b2
--- /dev/null
+++ b/maven-wagon-migration-to-component-metadata.patch
@@ -0,0 +1,28 @@
+diff -Naur wagon-1.0.orig/pom.xml wagon-1.0/pom.xml
+--- wagon-1.0.orig/pom.xml 2011-07-27 12:42:05.000000000 +0200
++++ wagon-1.0/pom.xml 2011-07-27 12:59:05.031845442 +0200
+@@ -226,21 +226,20 @@
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <!-- the one in maven-parent-10 and after is no longer backward compatible-->
+- <version>1.3.5</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>generate</id>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/maven-wagon.spec b/maven-wagon.spec
index d4fa44b..0c7fd6e 100644
--- a/maven-wagon.spec
+++ b/maven-wagon.spec
@@ -32,7 +32,7 @@
Name: maven-%{bname}
Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Tools to manage artifacts and deployment
License: ASL 2.0
@@ -42,6 +42,7 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{ver
Source1: wagon-1.0-jpp-depmap.xml
Patch1: disable-tck.patch
+Patch2: %{name}-migration-to-component-metadata.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
@@ -59,7 +60,7 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-enforcer-plugin
#BuildRequires: maven2-default-skin
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
BuildRequires: maven-scm-test
BuildRequires: xerces-j2
BuildRequires: classworlds
@@ -126,6 +127,7 @@ Documents for %{name}.
sed -i "s|<module>wagon-webdav-jackrabbit</module>|<!-- <module>wagon-webdav-jackrabbit</module> -->|" wagon-providers/pom.xml
%patch1
+%patch2 -p1
# To wire out jetty, plexus-avalon-personality and plexus-ftpd requirement
rm -f wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
@@ -273,6 +275,9 @@ install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Wed Jul 27 2011 Jaromir Capik <jcapik at redhat.com> - 0:1.0-2
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+
* Wed Jul 27 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-1
- Update to 1.0 final.
More information about the scm-commits
mailing list