mirror of https://github.com/apache/maven.git
Backing out changes from MNG-1650, since this was already implemented in the archiver.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@351505 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b0b047eff9
commit
77249c67de
|
@ -215,13 +215,6 @@ public class MavenArchiver
|
|||
|
||||
public void createArchive( MavenProject project, MavenArchiveConfiguration archiveConfiguration )
|
||||
throws ArchiverException, ManifestException, IOException, DependencyResolutionRequiredException
|
||||
{
|
||||
createArchive( project, archiveConfiguration, false );
|
||||
}
|
||||
|
||||
public void createArchive( MavenProject project, MavenArchiveConfiguration archiveConfiguration,
|
||||
boolean excludePomFiles )
|
||||
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...
|
||||
|
@ -253,10 +246,7 @@ public class MavenArchiver
|
|||
|
||||
File exportReadyPom = writeExportReadyPom( workingProject );
|
||||
|
||||
if( !excludePomFiles )
|
||||
{
|
||||
archiver.addFile( exportReadyPom, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.xml" );
|
||||
}
|
||||
archiver.addFile( exportReadyPom, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.xml" );
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
@ -277,10 +267,7 @@ public class MavenArchiver
|
|||
|
||||
os.close(); // stream is flushed but not closed by Properties.store()
|
||||
|
||||
if( !excludePomFiles )
|
||||
{
|
||||
archiver.addFile( pomPropertiesFile, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties" );
|
||||
}
|
||||
archiver.addFile( pomPropertiesFile, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties" );
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue