You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2005/09/09 15:26:59 UTC
svn commit: r279767 - in
/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release:
PrepareReleaseMojo.java helpers/ProjectVersionResolver.java
Author: evenisse
Date: Fri Sep 9 06:26:54 2005
New Revision: 279767
URL: http://svn.apache.org/viewcvs?rev=279767&view=rev
Log:
o Fix prepare release for poms with non snapshot parent
o Fix version resolver for version without "-" like -alpha-2 but 1.0.2
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java
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=279767&r1=279766&r2=279767&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 Fri Sep 9 06:26:54 2005
@@ -540,12 +540,23 @@
{
MavenProject parentProject = currentProject.getParent();
- String parentVersion = getVersionResolver().getResolvedVersion( parentProject.getGroupId(),
- parentProject.getArtifactId() );
+ String parentVersion = null;
- if ( isSnapshot( parentVersion ) )
+ if ( isSnapshot( parentProject.getVersion() ) )
{
- throw new MojoExecutionException( "Can't release project due to non released parent." );
+ parentVersion = getVersionResolver().getResolvedVersion( parentProject.getGroupId(),
+ parentProject.getArtifactId() );
+
+ if ( parentVersion == null )
+ {
+ parentVersion = parentProject.getVersion();
+ }
+
+ if ( isSnapshot( parentVersion ) )
+ {
+ throw new MojoExecutionException( "Can't release project due to non released parent (" +
+ parentProject.getGroupId() + ":" + parentProject.getArtifactId() + parentVersion + "." );
+ }
}
currentProject = parentProject;
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java?rev=279767&r1=279766&r2=279767&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java Fri Sep 9 06:26:54 2005
@@ -86,10 +86,10 @@
{
String projectVersion = project.getOriginalModel().getVersion();
- if ( project.getVersion().endsWith( "SNAPSHOT" ) )
+ if ( projectVersion.endsWith( "SNAPSHOT" ) )
{
String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
- throw new MojoExecutionException( "The project " + projectId + " is a snapshot (" + project.getVersion() +
+ throw new MojoExecutionException( "The project " + projectId + " is a snapshot (" + projectVersion +
"). It appears that the release version has not been committed." );
}
@@ -99,8 +99,23 @@
// releaseVersion = 1.0-beta-4
// snapshotVersion = 1.0-beta-5-SNAPSHOT
+ // or
+ // releaseVersion = 1.0.4
+ // snapshotVersion = 1.0.5-SNAPSHOT
- String nextVersionString = projectVersion.substring( projectVersion.lastIndexOf( "-" ) + 1 );
+ String nextVersionString = null;
+ if ( projectVersion.indexOf( "-" ) > 0 )
+ {
+ nextVersionString = projectVersion.substring( projectVersion.lastIndexOf( "-" ) + 1 );
+ }
+ else if ( projectVersion.indexOf( "." ) > 0 )
+ {
+ nextVersionString = projectVersion.substring( projectVersion.lastIndexOf( "." ) + 1 );
+ }
+ else
+ {
+ nextVersionString = projectVersion;
+ }
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org