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 22:32:44 UTC
svn commit: r351476 -
/maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Author: jdcasey
Date: Thu Dec 1 13:32:42 2005
New Revision: 351476
URL: http://svn.apache.org/viewcvs?rev=351476&view=rev
Log:
PR: MNG-1650
Submitted By: Allan Ramirez
Reviewed By: John Casey
Applied patch, with modifications. First, refactored to avoid the use of a member variable for turning POM inclusion on/off. Second, please remember to follow the code formatting rules for Maven, available on the project website.
This patch provides a new method for createArchive(..) which includes a flag for turning off POM inclusion from the resulting archive. The default mode used by the original createArchive(..) method is still to include POM information.
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=351476&r1=351475&r2=351476&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 13:32:42 2005
@@ -45,7 +45,7 @@
private JarArchiver archiver;
private File archiveFile;
-
+
/**
* Return a pre-configured manifest
*
@@ -216,6 +216,13 @@
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 );
@@ -246,8 +253,12 @@
File exportReadyPom = writeExportReadyPom( workingProject );
- archiver.addFile( exportReadyPom, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.xml" );
-
+ if( !excludePomFiles )
+ {
+ archiver.addFile( exportReadyPom, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.xml" );
+ }
+
+
// ----------------------------------------------------------------------
// Create pom.properties file
// ----------------------------------------------------------------------
@@ -266,7 +277,10 @@
os.close(); // stream is flushed but not closed by Properties.store()
- archiver.addFile( pomPropertiesFile, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties" );
+ if( !excludePomFiles )
+ {
+ archiver.addFile( pomPropertiesFile, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties" );
+ }
}
// ----------------------------------------------------------------------