You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2014/03/22 12:59:34 UTC
svn commit: r1580199 - in /maven/release/trunk/maven-release-manager: pom.xml
src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
src/main/mdo/release-descriptor.mdo
Author: rfscholte
Date: Sat Mar 22 11:59:34 2014
New Revision: 1580199
URL: http://svn.apache.org/r1580199
Log:
MRELEASE-431: Add projectVersionPolicyId to the releaseDescriptor
Modified:
maven/release/trunk/maven-release-manager/pom.xml
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
Modified: maven/release/trunk/maven-release-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1580199&r1=1580198&r2=1580199&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Sat Mar 22 11:59:34 2014
@@ -229,7 +229,7 @@
</execution>
</executions>
<configuration>
- <version>2.3.0</version>
+ <version>2.5.1</version>
<packageWithVersion>false</packageWithVersion>
<useJava5>true</useJava5>
<models>
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java?rev=1580199&r1=1580198&r2=1580199&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java Sat Mar 22 11:59:34 2014
@@ -263,13 +263,13 @@ public class MapVersionsPhase
{
try
{
- suggestedVersion = resolveSuggestedVersion( baseVersion );
+ suggestedVersion = resolveSuggestedVersion( baseVersion, releaseDescriptor.getProjectVersionPolicyId() );
}
catch ( VersionParseException e )
{
if ( releaseDescriptor.isInteractive() )
{
- suggestedVersion = resolveSuggestedVersion( "1.0" );
+ suggestedVersion = resolveSuggestedVersion( "1.0", releaseDescriptor.getProjectVersionPolicyId() );
}
else
{
@@ -314,11 +314,11 @@ public class MapVersionsPhase
return nextVersion;
}
- private String resolveSuggestedVersion( String baseVersion )
+ private String resolveSuggestedVersion( String baseVersion, String policyId )
throws PolicyException, VersionParseException
{
// right now only default available
- VersionPolicy policy = versionPolicies.get( "default" );
+ VersionPolicy policy = versionPolicies.get( policyId );
VersionPolicyRequest request = new VersionPolicyRequest().setVersion( baseVersion );
return convertToSnapshot ? policy.getDevelopmentVersion( request ).getVersion()
Modified: maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo?rev=1580199&r1=1580198&r2=1580199&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo (original)
+++ maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo Sat Mar 22 11:59:34 2014
@@ -434,6 +434,15 @@
Default version to use for new working copy.
</description>
</field>
+ <field>
+ <name>projectVersionPolicyId</name>
+ <version>2.5.1+</version>
+ <type>String</type>
+ <defaultValue>default</defaultValue>
+ <description>
+ The role-hint for the VersionPolicy implementation used to calculate the project versions.
+ </description>
+ </field>
<field>
<name>remoteTagging</name>