[maven-doxia-tools] Port to Maven 3 API

[Mikolaj Izdebski]

commit e4aae59b7ba56059ec577744cef3ec57335cdfb2
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Jan 17 17:19:12 2014 +0100

    Port to Maven 3 API

 0001-Port-to-Maven-3-APIs.patch                    |   80 ++++++++++++++++++++
 ...xia-tools-migration-to-component-metadata.patch |   29 -------
 maven-doxia-tools.spec                             |   12 ++-
 3 files changed, 87 insertions(+), 34 deletions(-)
---
diff --git a/0001-Port-to-Maven-3-APIs.patch b/0001-Port-to-Maven-3-APIs.patch
new file mode 100644
index 0000000..53605cc
--- /dev/null
+++ b/0001-Port-to-Maven-3-APIs.patch
@@ -0,0 +1,80 @@
+From ac98812d7b558e66c728e02a4b169e165c28d080 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Fri, 17 Jan 2014 17:09:07 +0100
+Subject: [PATCH] Port to Maven 3 APIs
+
+---
+ pom.xml | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 00f25e1..9f12070 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -37,7 +37,7 @@
+   <description>A collection of tools to help the integration of Doxia in Maven plugins.</description>
+ 
+   <prerequisites>
+-    <maven>2.2.1</maven>
++    <maven>${mavenVersion}</maven>
+   </prerequisites>
+ 
+   <scm>
+@@ -58,7 +58,7 @@
+   <properties>
+     <doxiaVersion>1.2</doxiaVersion>
+     <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion>
+-    <mavenVersion>2.2.1</mavenVersion>
++    <mavenVersion>3.1.1</mavenVersion>
+   </properties>
+ 
+   <dependencies>
+@@ -75,24 +75,24 @@
+     </dependency>
+ 
+     <!-- maven -->
+-    <dependency>
++     <dependency>
+       <groupId>org.apache.maven</groupId>
+-      <artifactId>maven-artifact</artifactId>
++      <artifactId>maven-core</artifactId>
+       <version>${mavenVersion}</version>
+     </dependency>
+-    <dependency>
++     <dependency>
+       <groupId>org.apache.maven</groupId>
+-      <artifactId>maven-artifact-manager</artifactId>
++      <artifactId>maven-compat</artifactId>
+       <version>${mavenVersion}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+-      <artifactId>maven-model</artifactId>
++      <artifactId>maven-artifact</artifactId>
+       <version>${mavenVersion}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+-      <artifactId>maven-project</artifactId>
++      <artifactId>maven-model</artifactId>
+       <version>${mavenVersion}</version>
+     </dependency>
+     <dependency>
+@@ -174,12 +174,12 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <id>create-component-descriptor</id>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
+-- 
+1.8.4.2
+
diff --git a/maven-doxia-tools.spec b/maven-doxia-tools.spec
index c46ee3a..b93df78 100644
--- a/maven-doxia-tools.spec
+++ b/maven-doxia-tools.spec
@@ -1,6 +1,6 @@
 Name:           maven-doxia-tools
 Version:        1.4
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Maven Doxia Integration Tools
 License:        ASL 2.0
 URL:            http://maven.apache.org/shared/maven-doxia-tools/
@@ -8,18 +8,17 @@ BuildArch:      noarch
 
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
-Patch0:         %{name}-migration-to-component-metadata.patch
+Patch0:         0001-Port-to-Maven-3-APIs.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-decoration-model)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-logging-api)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
-BuildRequires:  mvn(org.apache.maven:maven-artifact-manager)
 BuildRequires:  mvn(org.apache.maven:maven-compat)
+BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.apache.maven:maven-project)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
@@ -39,7 +38,7 @@ This package contains %{summary}.
 
 %prep
 %setup -q
-%patch0 -b .sav
+%patch0 -p1 -b .sav
 %pom_xpath_remove "pom:dependency[pom:scope[text()='test']]"
 
 %mvn_file : %{name}
@@ -58,6 +57,9 @@ This package contains %{summary}.
 %doc LICENSE NOTICE
 
 %changelog
+* Fri Jan 17 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.4-14
+- Port to Maven 3 API
+
 * Tue Oct  1 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.4-13
 - Install NOTICE file with javadoc package
 - Update to current packaging guidelines