File _service:tar_scm:002-mavenrelease-fixbuild.patch of Package maven-release

File _service:tar_scm:002-mavenrelease-fixbuild.patch of Package maven-release (Revision 248a7ec1ba17fd9ea422341bd855bffe)

Currently displaying revision 248a7ec1ba17fd9ea422341bd855bffe , Show latest

--- maven-release-2.2/maven-release-manager/pom.xml	2011-06-27 10:45:56.000000000 +0200
+++ maven-release-2.2-patched/maven-release-manager/pom.xml	2011-07-26 16:06:54.854973698 +0200
@@ -80,6 +80,12 @@
 
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <version>${mavenVersion}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
       <version>${mavenVersion}</version>
     </dependency>
@@ -254,13 +243,13 @@
       </plugin>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <executions>
           <execution>
             <id>create-component-descriptor</id>
             <phase>generate-resources</phase>
             <goals>
-              <goal>descriptor</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
           <execution>
@@ -274,7 +263,7 @@
             </configuration>
             <phase>process-resources</phase>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>merge-metadata</goal>
             </goals>
           </execution>
         </executions>
--- maven-release-2.2/maven-release-plugin/pom.xml	2011-06-27 10:45:56.000000000 +0200
+++ maven-release-2.2-patched/maven-release-plugin/pom.xml	2011-07-26 16:03:02.203751549 +0200
@@ -53,6 +53,11 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <version>${mavenVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>${mavenVersion}</version>
     </dependency>