You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2005/12/01 23:20:35 UTC
svn commit: r351505 -
/maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Author: jdcasey
Date: Thu Dec 1 14:20:31 2005
New Revision: 351505
URL: http://svn.apache.org/viewcvs?rev=351505&view=rev
Log:
Backing out changes from MNG-1650, since this was already implemented in the archiver.
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=351505&r1=351504&r2=351505&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 Dec 1 14:20:31 2005
@@ -216,13 +216,6 @@
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...
MavenProject workingProject = new MavenProject( project );
@@ -253,10 +246,7 @@
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 @@
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" );
}
// ----------------------------------------------------------------------