Author: brett
Date: Wed Sep 7 07:27:51 2005
New Revision: 279328
URL: http://svn.apache.org/viewcvs?rev=279328&view=rev
Log:
more fixes to the release plugin
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=279328&r1=279327&r2=279328&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
Wed Sep 7 07:27:51 2005
@@ -74,6 +74,8 @@
private static final String RELEASE_POM = "release-pom.xml";
+ private static final String POM = "pom.xml";
+
/**
* @parameter expression="${basedir}"
* @required
@@ -255,12 +257,6 @@
private void transformPomToSnapshotVersionPom( MavenProject project )
throws MojoExecutionException
{
- if ( isSnapshot( project.getVersion() ) )
- {
- throw new MojoExecutionException( "This project is a snapshot (" +
project.getVersion() +
- "). It appears that the release version has not been
committed." );
- }
-
Model model = project.getOriginalModel();
ProjectVersionResolver versionResolver = getVersionResolver();
@@ -361,15 +357,17 @@
}
Writer writer = null;
+ File file = new File( project.getFile().getParentFile(), POM );
+
try
{
- writer = new FileWriter( project.getFile() );
+ writer = new FileWriter( file );
project.writeOriginalModel( writer );
}
catch ( IOException e )
{
- throw new MojoExecutionException( "Cannot write development
version of pom to: " + project.getFile(), e );
+ throw new MojoExecutionException( "Cannot write development
version of pom to: " + file, e );
}
finally
{
@@ -777,15 +775,16 @@
Writer writer = null;
+ File file = new File( project.getFile().getParentFile(), POM );
try
{
- writer = new FileWriter( project.getFile() );
+ writer = new FileWriter( file );
project.writeOriginalModel( writer );
}
catch ( IOException e )
{
- throw new MojoExecutionException( "Cannot write released version
of pom to: " + project.getFile(), e );
+ throw new MojoExecutionException( "Cannot write released version
of pom to: " + file, e );
}
finally
{
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=279328&r1=279327&r2=279328&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
Wed Sep 7 07:27:51 2005
@@ -86,6 +86,13 @@
{
String projectVersion = project.getOriginalModel().getVersion();
+ if ( project.getVersion().endsWith( "SNAPSHOT" ) )
+ {
+ String projectId = ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() );
+ throw new MojoExecutionException( "The project " + projectId + "
is a snapshot (" + project.getVersion() +
+ "). It appears that the release version has not been
committed." );
+ }
+
// TODO: we will need to incorporate versioning strategies here
because it is unlikely
// that everyone will be able to agree on a standard. This is
extremely limited right
// now and really only works for the way maven is versioned.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
