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

fix release-pom.xml 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279063 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-09-06 18:50:54 +00:00
parent 2464320d3a
commit aa34ddef37
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -818,19 +818,12 @@ private void generateReleasePoms()
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 @@ private void generateReleasePoms()
}
}
File releasePomFile = new File( basedir, RELEASE_POM );
File releasePomFile = new File( releaseProject.getFile().getParentFile(), RELEASE_POM );
Writer writer = null;
@ -929,7 +922,7 @@ private void generateReleasePoms()
{
writer = new FileWriter( releasePomFile );
releaseProject.writeModel( writer );
releaseProject.writeOriginalModel( writer );
}
catch ( IOException e )
{