Author: jdcasey
Date: Sun Sep 25 07:49:27 2005
New Revision: 291420
URL: http://svn.apache.org/viewcvs?rev=291420&view=rev
Log:
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.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java
maven/components/trunk/maven-plugins/maven-release-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?rev=291420&r1=291419&r2=291420&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Sun Sep 25 07:49:27 2005
@@ -87,7 +87,10 @@
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
{
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java?rev=291420&r1=291419&r2=291420&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java
Sun Sep 25 07:49:27 2005
@@ -28,6 +28,13 @@
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;
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/pom.xml?rev=291420&r1=291419&r2=291420&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/pom.xml Sun Sep
25 07:49:27 2005
@@ -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>
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=291420&r1=291419&r2=291420&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Sun Sep 25 07:49:27 2005
@@ -961,8 +961,8 @@
String version;
try
{
- version =
pluginVersionManager.resolveReportPluginVersion( plugin.getGroupId(), plugin
- .getArtifactId(), project, settings,
localRepository );
+ version =
pluginVersionManager.resolvePluginVersion( plugin.getGroupId(), plugin
+ .getArtifactId(), project, settings,
localRepository, true );
}
catch ( PluginVersionResolutionException e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
