You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ev...@apache.org on 2005/11/18 08:54:45 UTC
svn commit: r345471 -
/maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Author: evenisse
Date: Thu Nov 17 23:54:40 2005
New Revision: 345471
URL: http://svn.apache.org/viewcvs?rev=345471&view=rev
Log:
Fix compile error
Modified:
maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Modified: maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=345471&r1=345470&r2=345471&view=diff
==============================================================================
--- maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java (original)
+++ maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java Thu Nov 17 23:54:40 2005
@@ -216,6 +216,12 @@
public void createArchive( MavenProject project, MavenArchiveConfiguration archiveConfiguration )
throws ArchiverException, ManifestException, IOException, DependencyResolutionRequiredException
{
+ // we have to clone the project instance so we can write out the pom with the deployment version,
+ // without impacting the main project instance...
+ MavenProject workingProject = new MavenProject( project );
+
+ File pomPropertiesFile = new File( workingProject.getFile().getParentFile(), "pom.properties" );
+
if ( archiveConfiguration.isAddMavenDescriptor() )
{
// ----------------------------------------------------------------------
@@ -229,10 +235,6 @@
// POM information without the use of maven tools can do so.
// ----------------------------------------------------------------------
- // we have to clone the project instance so we can write out the pom with the deployment version,
- // without impacting the main project instance...
- MavenProject workingProject = new MavenProject( project );
-
if ( workingProject.getArtifact().isSnapshot() )
{
workingProject.setVersion( workingProject.getArtifact().getVersion() );
@@ -258,8 +260,6 @@
p.setProperty( "version", workingProject.getVersion() );
- File pomPropertiesFile = new File( workingProject.getFile().getParentFile(), "pom.properties" );
-
OutputStream os = new FileOutputStream( pomPropertiesFile );
p.store( os, "Generated by Maven" );
@@ -335,8 +335,10 @@
archiver.createArchive();
// Cleanup
-
- pomPropertiesFile.delete();
+ if ( archiveConfiguration.isAddMavenDescriptor() )
+ {
+ pomPropertiesFile.delete();
+ }
}
private File writeExportReadyPom( MavenProject project )