Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolving: MNG-879. Now, all isSnapshot() stuff for the release plugin is handled by ArtifactUtils, so it's possible to reuse the logic rather than replicate it. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289311 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-09-15 20:40:43 +00:00
parent c5361940c3
commit 75ac363378
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
View File

@ -28,6 +28,11 @@ private ArtifactUtils()
{
}
public static boolean isSnapshot( String version )
{
return version != null && Artifact.VERSION_FILE_PATTERN.matcher( version ).matches();
}
public static String versionlessKey( Artifact artifact )
{
return versionlessKey( artifact.getGroupId(), artifact.getArtifactId() );

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

@ -71,8 +71,6 @@
public class PrepareReleaseMojo
extends AbstractReleaseMojo
{
private static final String SNAPSHOT = "-SNAPSHOT";
private static final String RELEASE_POM = "release-pom.xml";
private static final String POM = "pom.xml";
@ -241,6 +239,7 @@ protected void executeTask()
}
}
//TODO reinstate.
// removeReleasePoms();
checkInNextSnapshot();
@ -458,11 +457,6 @@ protected ProjectScmRewriter getScmRewriter()
return scmRewriter;
}
private boolean isSnapshot( String version )
{
return version.endsWith( SNAPSHOT );
}
private void checkForLocalModifications()
throws MojoExecutionException
{
@ -544,7 +538,7 @@ private void checkForPresenceOfSnapshots( MavenProject project )
String parentVersion = null;
if ( isSnapshot( parentProject.getVersion() ) )
if ( ArtifactUtils.isSnapshot( parentProject.getVersion() ) )
{
parentVersion = getVersionResolver().getResolvedVersion( parentProject.getGroupId(),
parentProject.getArtifactId() );
@ -554,7 +548,7 @@ private void checkForPresenceOfSnapshots( MavenProject project )
parentVersion = parentProject.getVersion();
}
if ( isSnapshot( parentVersion ) )
if ( ArtifactUtils.isSnapshot( parentVersion ) )
{
throw new MojoExecutionException( "Can't release project due to non released parent (" +
parentProject.getGroupId() + ":" + parentProject.getArtifactId() + parentVersion + "." );
@ -580,7 +574,7 @@ private void checkForPresenceOfSnapshots( MavenProject project )
artifactVersion = artifact.getVersion();
}
if ( isSnapshot( artifactVersion ) )
if ( ArtifactUtils.isSnapshot( artifactVersion ) )
{
snapshotDependencies.add( artifact );
}
@ -600,7 +594,7 @@ private void checkForPresenceOfSnapshots( MavenProject project )
artifactVersion = artifact.getVersion();
}
if ( isSnapshot( artifactVersion ) )
if ( ArtifactUtils.isSnapshot( artifactVersion ) )
{
snapshotDependencies.add( artifact );
}
@ -633,7 +627,7 @@ private void checkForPresenceOfSnapshots( MavenProject project )
private void transformPomToReleaseVersionPom( MavenProject project )
throws MojoExecutionException
{
if ( !isSnapshot( project.getVersion() ) )
if ( !ArtifactUtils.isSnapshot( project.getVersion() ) )
{
throw new MojoExecutionException( "The project " + project.getGroupId() + ":" + project.getArtifactId() +
" isn't a snapshot (" + project.getVersion() + ")." );
@ -646,7 +640,7 @@ private void transformPomToReleaseVersionPom( MavenProject project )
{
Artifact parentArtifact = project.getParentArtifact();
if ( isSnapshot( parentArtifact.getBaseVersion() ) )
if ( ArtifactUtils.isSnapshot( parentArtifact.getBaseVersion() ) )
{
String version = resolveVersion( parentArtifact, "parent", project );