svn commit: r1232525 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

[jdcasey]

Author: jdcasey
Date: Tue Jan 17 18:29:55 2012
New Revision: 1232525

URL: http://svn.apache.org/viewvc?rev=1232525&view=rev
Log:
[MJAVADOC-336] Delete argument files directly after use to prevent their 
inclusion in reports/archives/etc.

Submitted by: Christian Schulte


Modified:
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1232525&r1=1232524&r2=1232525&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 Tue Jan 17 18:29:55 2012
@@ -1997,6 +1997,8 @@ public abstract class AbstractJavadocMoj
         executeJavadocCommandLine( cmd, javadocOutputDirectory );
 
         // delete generated javadoc files only if no error and no debug mode
+        // [MJAVADOC-336] Use File.delete() instead of File.deleteOnExit() to
+        // prevent these files from making their way into archives.
         if ( !debug )
         {
             for ( int i = 0; i < cmd.getArguments().length; i++)
@@ -2011,14 +2013,14 @@ public abstract class AbstractJavadocMoj
                 File argFile = new File( javadocOutputDirectory, 
arg.substring( 1 ) );
                 if ( argFile.exists() )
                 {
-                    argFile.deleteOnExit();
+                    argFile.delete();
                 }
             }
 
             File scriptFile = new File( javadocOutputDirectory, 
DEBUG_JAVADOC_SCRIPT_NAME );
             if ( scriptFile.exists() )
             {
-                scriptFile.deleteOnExit();
+                scriptFile.delete();
             }
         }
     }