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/09 05:06:33 UTC
svn commit: r355355 -
/maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Author: jdcasey
Date: Thu Dec 8 20:06:31 2005
New Revision: 355355
URL: http://svn.apache.org/viewcvs?rev=355355&view=rev
Log:
PR: MNG-1543
Submitted By: Edwin Punzalan
Reviewed By: John Casey
Applied patch, with modifications. Since the writeExportReadyPom() method is no longer used, and it's not a public API, I removed it.
Interpolated paths should no longer show up in packaged POMs.
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=355355&r1=355354&r2=355355&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 8 20:06:31 2005
@@ -23,11 +23,9 @@
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.Manifest;
import org.codehaus.plexus.archiver.jar.ManifestException;
-import org.codehaus.plexus.util.IOUtil;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Iterator;
@@ -244,9 +242,7 @@
String artifactId = workingProject.getArtifactId();
- File exportReadyPom = writeExportReadyPom( workingProject );
-
- archiver.addFile( exportReadyPom, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.xml" );
+ archiver.addFile( project.getFile(), "META-INF/maven/" + groupId + "/" + artifactId + "/pom.xml" );
// ----------------------------------------------------------------------
@@ -340,32 +336,5 @@
{
pomPropertiesFile.delete();
}
- }
-
- private File writeExportReadyPom( MavenProject project )
- throws IOException
- {
- String buildDirectory = project.getBuild().getDirectory();
-
- File buildDirectoryFile = new File( buildDirectory );
-
- buildDirectoryFile.mkdirs();
-
- File fullPom = new File( buildDirectoryFile, "exported-pom.xml" );
-
- FileWriter fWriter = null;
-
- try
- {
- fWriter = new FileWriter( fullPom );
-
- project.writeModel( fWriter );
- }
- finally
- {
- IOUtil.close( fWriter );
- }
-
- return fullPom;
}
}