From 77249c67de2cd347b913dedf0b8164337d0672cb Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Thu, 1 Dec 2005 22:20:31 +0000 Subject: [PATCH] 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 --- .../apache/maven/archiver/MavenArchiver.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java index 04436d6857..ffb77d2421 100644 --- a/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java +++ b/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java @@ -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" ); } // ----------------------------------------------------------------------