You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/09/06 20:50:59 UTC
svn commit: r279063 -
/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Author: brett
Date: Tue Sep 6 11:50:54 2005
New Revision: 279063
URL: http://svn.apache.org/viewcvs?rev=279063&view=rev
Log:
fix release-pom.xml
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.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=279063&r1=279062&r2=279063&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 Tue Sep 6 11:50:54 2005
@@ -818,19 +818,12 @@
MavenProject project = (MavenProject) it.next();
MavenProject releaseProject = new MavenProject( project );
- Model releaseModel = releaseProject.getModel();
+ Model releaseModel = releaseProject.getOriginalModel();
- //Rewrite parent version
- if ( project.hasParent() )
+ // Remove parent
+ if ( releaseModel.getParent() != null )
{
- Artifact parentArtifact = project.getParentArtifact();
-
- if ( isSnapshot( parentArtifact.getBaseVersion() ) )
- {
- String version = resolveVersion( parentArtifact, "parent", releaseProject );
-
- releaseModel.getParent().setVersion( version );
- }
+ releaseModel.setParent( null );
}
Set artifacts = releaseProject.getArtifacts();
@@ -921,7 +914,7 @@
}
}
- File releasePomFile = new File( basedir, RELEASE_POM );
+ File releasePomFile = new File( releaseProject.getFile().getParentFile(), RELEASE_POM );
Writer writer = null;
@@ -929,7 +922,7 @@
{
writer = new FileWriter( releasePomFile );
- releaseProject.writeModel( writer );
+ releaseProject.writeOriginalModel( writer );
}
catch ( IOException e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org