Rolling back the release plugin's dependencies to -beta-1 of maven, and making resolvePluginVersion(..) with the flag for processAsReport public again with deprecation, so the release plugin continues to function into the next release.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291420 13f79535-47bb-0310-9956-ffa450edef68

maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java

@@ -87,7 +87,10 @@ public class DefaultPluginVersionManager
         return resolvePluginVersion( groupId, artifactId, project, settings, localRepository, true );
     }
 
-    private String resolvePluginVersion( String groupId, String artifactId, MavenProject project, Settings settings,
+    /**
+     * @deprecated Make private, use resolveReportPluginVersion(..) or resolvePluginVersion(..) instead.
+     */
+    public String resolvePluginVersion( String groupId, String artifactId, MavenProject project, Settings settings,
                                          ArtifactRepository localRepository, boolean resolveAsReportPlugin )
         throws PluginVersionResolutionException
     {

maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java

@@ -28,6 +28,13 @@ public interface PluginVersionManager
                                  ArtifactRepository localRepository )
         throws PluginVersionResolutionException;
 
+    /**
+     * @deprecated Use resolveReportPluginVersion(..) instead.
+     */
+    String resolvePluginVersion( String groupId, String artifactId, MavenProject project, Settings settings,
+                                 ArtifactRepository localRepository, boolean processAsReport )
+        throws PluginVersionResolutionException;
+
     String resolveReportPluginVersion( String groupId, String artifactId, MavenProject project, Settings settings,
                                        ArtifactRepository localRepository )
         throws PluginVersionResolutionException;

maven-plugins/maven-release-plugin/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <artifactId>maven-plugin-parent</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>2.0-beta-2-SNAPSHOT</version>
+    <version>2.0-beta-1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-release-plugin</artifactId>
@@ -13,12 +13,12 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>2.0-beta-2-SNAPSHOT</version>
+      <version>2.0-beta-1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.0-beta-2-SNAPSHOT</version>
+      <version>2.0-beta-1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
@@ -42,12 +42,12 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact-manager</artifactId>
-      <version>2.0-beta-2-SNAPSHOT</version>
+      <version>2.0-beta-1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.0-beta-2-SNAPSHOT</version>
+      <version>2.0-beta-1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>

maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java

@@ -961,8 +961,8 @@ public class PrepareReleaseMojo
                         String version;
                         try
                         {
-                            version = pluginVersionManager.resolveReportPluginVersion( plugin.getGroupId(), plugin
+                            version = pluginVersionManager.resolvePluginVersion( plugin.getGroupId(), plugin
-                                .getArtifactId(), project, settings, localRepository );
+                                .getArtifactId(), project, settings, localRepository, true );
                         }
                         catch ( PluginVersionResolutionException e )
                         {