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