svn commit: r1742353 [1/3] - in /maven/plugins/trunk: maven-acr-plugin/ maven-acr-plugin/src/main/java/org/apache/maven/plugins/acr/ maven-ant-plugin/ maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/ maven-antrun-plugin/ maven-antrun-plugin/...

[schulte]

Author: schulte
Date: Thu May  5 03:22:53 2016
New Revision: 1742353

URL: http://svn.apache.org/viewvc?rev=1742353&view=rev
Log:
o Updated to 'plexus-utils-3.0.23'.
o Updated to stop suppressing exceptions incorrectly when closing resources.
  Most of the time the 'IOUtils.closeQuietly' methods of 'commons-io' and
  the 'IOUtil.close' method of 'plexus-utils' are used incorrectly. They
  are meant to be used in 'finally' blocks to not suppress an exception
  already thrown in the 'try' block. The documentation of the
  'IOUtils.closeQuietly' methods explicitly contains usage examples.
  As soon as 'commons-io' or 'plexus-utils' is targetted at Java 1.7, those
  methods should get deprecated and people should be told to use the
  try-with-resources statement instead.


Modified:
    maven/plugins/trunk/maven-acr-plugin/pom.xml
    
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugins/acr/AcrMojo.java
    maven/plugins/trunk/maven-ant-plugin/pom.xml
    
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
    maven/plugins/trunk/maven-antrun-plugin/pom.xml
    
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
    maven/plugins/trunk/maven-assembly-plugin/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
    
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java
    
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
    
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
    maven/plugins/trunk/maven-changelog-plugin/pom.xml
    
maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/AbstractChangeLogReportTest.java
    maven/plugins/trunk/maven-changes-plugin/pom.xml
    
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
    
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
    
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
    
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java
    
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/DefaultChangesSchemaValidator.java
    
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
    
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/announcement/AnnouncementMojoTest.java
    maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
    
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
    
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
    
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
    maven/plugins/trunk/maven-dependency-plugin/pom.xml
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
    maven/plugins/trunk/maven-deploy-plugin/pom.xml
    
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
    maven/plugins/trunk/maven-doap-plugin/pom.xml
    
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java
    
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java
    
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java
    maven/plugins/trunk/maven-docck-plugin/pom.xml
    
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
    
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
    maven/plugins/trunk/maven-ear-plugin/pom.xml
    maven/plugins/trunk/maven-eclipse-plugin/pom.xml
    maven/plugins/trunk/maven-ejb-plugin/pom.xml
    
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
    maven/plugins/trunk/maven-gpg-plugin/pom.xml
    
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
    maven/plugins/trunk/maven-help-plugin/pom.xml
    
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
    
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
    
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
    maven/plugins/trunk/maven-install-plugin/pom.xml
    
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/DualDigester.java
    
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/SimpleDigester.java
    maven/plugins/trunk/maven-invoker-plugin/pom.xml
    
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
    
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java
    
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/PomUtils.java
    
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
    maven/plugins/trunk/maven-jar-plugin/pom.xml
    maven/plugins/trunk/maven-javadoc-plugin/pom.xml
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
    maven/plugins/trunk/maven-jdeps-plugin/pom.xml
    maven/plugins/trunk/maven-linkcheck-plugin/pom.xml
    
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
    maven/plugins/trunk/maven-patch-plugin/pom.xml
    
maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
    maven/plugins/trunk/maven-pdf-plugin/pom.xml
    
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentDescriptorReader.java
    
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
    
maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
    
maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java
    
maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/DefaultMavenProjectStub.java
    
maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/FilteringMavenProjectStub.java
    
maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ITextMavenProjectStub.java
    
maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
    maven/plugins/trunk/maven-pmd-plugin/pom.xml
    
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
    
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
    
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
    
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
    
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
    
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
    
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
    
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
    
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
    maven/plugins/trunk/maven-rar-plugin/pom.xml
    maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
    
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
    
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
    
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
    maven/plugins/trunk/maven-repository-plugin/pom.xml
    
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
    
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/it/support/IntegrationTestUtils.java
    maven/plugins/trunk/maven-resources-plugin/pom.xml
    
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
    
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
    maven/plugins/trunk/maven-scm-publish-plugin/pom.xml
    
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
    maven/plugins/trunk/maven-shade-plugin/pom.xml
    
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
    
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
    
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
    
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
    
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.java
    
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java
    maven/plugins/trunk/maven-site-plugin/pom.xml
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorArtifactMetadata.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
    maven/plugins/trunk/maven-source-plugin/pom.xml
    
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
    maven/plugins/trunk/maven-stage-plugin/pom.xml
    
maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
    
maven/plugins/trunk/maven-stage-plugin/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java
    maven/plugins/trunk/maven-verifier-plugin/pom.xml
    
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugins/verifier/VerifierMojo.java
    maven/plugins/trunk/maven-war-plugin/pom.xml
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java

Modified: maven/plugins/trunk/maven-acr-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-acr-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-acr-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -99,7 +99,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.22</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: 
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugins/acr/AcrMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugins/acr/AcrMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugins/acr/AcrMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugins/acr/AcrMojo.java
 Thu May  5 03:22:53 2016
@@ -286,7 +286,10 @@ public class AcrMojo
         try
         {
             xmlReader = new XmlStreamReader( xmlFile );
-            return xmlReader.getEncoding();
+            final String encoding = xmlReader.getEncoding();
+            xmlReader.close();
+            xmlReader = null;
+            return encoding;
         }
         finally
         {

Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -108,7 +108,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>

Modified: 
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
 (original)
+++ 
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
 Thu May  5 03:22:53 2016
@@ -243,6 +243,8 @@ public class AntBuildWriter
         try
         {
             properties.store( os, "Generated by Maven Ant Plugin - DO NOT EDIT 
THIS FILE!" );
+            os.close();
+            os = null;
         }
         finally
         {
@@ -346,7 +348,7 @@ public class AntBuildWriter
 
         XmlWriterUtil.writeLineBreak( writer );
 
-        IOUtil.close( w );
+        w.close();
     }
 
     /**
@@ -415,7 +417,7 @@ public class AntBuildWriter
 
         XmlWriterUtil.writeLineBreak( writer );
 
-        IOUtil.close( w );
+        w.close();
     }
 
     /**

Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -84,7 +84,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>

Modified: 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
 Thu May  5 03:22:53 2016
@@ -647,15 +647,20 @@ public class AntRunMojo
         try
         {
             reader = new LineNumberReader( ReaderFactory.newXmlReader( antFile 
) );
-            String line;
-            while ( ( line = reader.readLine() ) != null )
+
+            for ( String line = reader.readLine(); line != null; line = 
reader.readLine() )
             {
                 if ( reader.getLineNumber() == 
buildException.getLocation().getLineNumber() )
                 {
                     return "around Ant part ..." + line.trim() + "... @ " + 
buildException.getLocation().getLineNumber()
-                        + ":" + buildException.getLocation().getColumnNumber() 
+ " in " + antFile.getAbsolutePath();
+                               + ":" + 
buildException.getLocation().getColumnNumber() + " in "
+                               + antFile.getAbsolutePath();
+
                 }
             }
+
+            reader.close();
+            reader = null;
         }
         catch ( Exception e )
         {

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -170,7 +170,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.22</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java
 Thu May  5 03:22:53 2016
@@ -86,6 +86,8 @@ public class ManifestCreationFinalizer
                     {
                         manifestFileReader = new InputStreamReader( new 
FileInputStream( manifestFile ), "UTF-8" );
                         manifest = new Manifest( manifestFileReader );
+                        manifestFileReader.close();
+                        manifestFileReader = null;
                     }
                     catch ( final FileNotFoundException e )
                     {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java
 Thu May  5 03:22:53 2016
@@ -92,6 +92,9 @@ abstract class AbstractLineAggregatingHa
                 {
                     writer.println( line );
                 }
+
+                writer.close();
+                writer = null;
             }
             catch ( final IOException e )
             {
@@ -159,14 +162,16 @@ abstract class AbstractLineAggregatingHa
         {
             reader = new BufferedReader( new InputStreamReader( 
fileInfo.getContents(), getEncoding() ) );
 
-            String line;
-            while ( ( line = reader.readLine() ) != null )
+            for ( String line = reader.readLine(); line != null; line = 
reader.readLine() )
             {
                 if ( !lines.contains( line ) )
                 {
                     lines.add( line );
                 }
             }
+
+            reader.close();
+            reader = null;
         }
         finally
         {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java
 Thu May  5 03:22:53 2016
@@ -39,7 +39,6 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.Collections;
@@ -108,9 +107,10 @@ public class ComponentsXmlArchiverFileFi
             final File f = File.createTempFile( "maven-assembly-plugin", "tmp" 
);
             f.deleteOnExit();
 
-            final Writer fileWriter = WriterFactory.newXmlWriter( new 
FileOutputStream( f ) );
+            Writer fileWriter = null;
             try
             {
+                fileWriter = WriterFactory.newXmlWriter( new FileOutputStream( 
f ) );
                 final Xpp3Dom dom = new Xpp3Dom( "component-set" );
                 final Xpp3Dom componentDom = new Xpp3Dom( "components" );
                 dom.addChild( componentDom );
@@ -121,6 +121,9 @@ public class ComponentsXmlArchiverFileFi
                 }
 
                 Xpp3DomWriter.write( fileWriter, dom );
+
+                fileWriter.close();
+                fileWriter = null;
             }
             finally
             {
@@ -189,14 +192,13 @@ public class ComponentsXmlArchiverFileFi
 
             if ( ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH.equals( 
entry ) )
             {
-                InputStream stream = null;
                 Reader reader = null;
-
                 try
                 {
-                    stream = fileInfo.getContents();
-                    reader = ReaderFactory.newXmlReader( stream );
-                    addComponentsXml( new BufferedReader( reader ) );
+                    reader = new BufferedReader( ReaderFactory.newXmlReader( 
fileInfo.getContents() ) );
+                    addComponentsXml( reader );
+                    reader.close();
+                    reader = null;
                 }
                 catch ( final XmlPullParserException e )
                 {
@@ -208,7 +210,6 @@ public class ComponentsXmlArchiverFileFi
                 }
                 finally
                 {
-                    IOUtil.close( stream );
                     IOUtil.close( reader );
                 }
 

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
 Thu May  5 03:22:53 2016
@@ -109,11 +109,9 @@ public class SimpleAggregatingDescriptor
             f = File.createTempFile( "maven-assembly-plugin", "tmp" );
             f.deleteOnExit();
 
-            boolean isProperty = AssemblyFileUtils.isPropertyFile( f );
-            FileOutputStream fos = new FileOutputStream( f );
-            writer = isProperty
-                ? new OutputStreamWriter( fos, "ISO-8859-1" )
-                : new OutputStreamWriter( fos ); // Still platform encoding
+            writer = AssemblyFileUtils.isPropertyFile( f )
+                         ? new OutputStreamWriter( new FileOutputStream( f ), 
"ISO-8859-1" )
+                         : new OutputStreamWriter( new FileOutputStream( f ) 
); // Still platform encoding
 
             writer.write( commentChars + " Aggregated on " + new Date() + " 
from: " );
 
@@ -125,6 +123,9 @@ public class SimpleAggregatingDescriptor
             writer.write( "\n\n" );
 
             writer.write( aggregateWriter.toString() );
+
+            writer.close();
+            writer = null;
         }
         catch ( final IOException e )
         {
@@ -188,27 +189,33 @@ public class SimpleAggregatingDescriptor
     private void readProperties( final FileInfo fileInfo )
         throws IOException
     {
-        final StringWriter writer = new StringWriter();
         Reader reader = null;
+        StringWriter writer = null;
         try
         {
-            boolean isProperty = AssemblyFileUtils.isPropertyFile( 
fileInfo.getName() );
+            writer = new StringWriter();
 
-            reader = isProperty
-                ? new InputStreamReader( fileInfo.getContents(), "ISO-8859-1" )
-                : new InputStreamReader( fileInfo.getContents() ); // platform 
encoding
+            reader = AssemblyFileUtils.isPropertyFile( fileInfo.getName() )
+                         ? new InputStreamReader( fileInfo.getContents(), 
"ISO-8859-1" )
+                         : new InputStreamReader( fileInfo.getContents() ); // 
platform encoding
 
             IOUtil.copy( reader, writer );
+
+            writer.close();
+            final String content = writer.toString();
+            writer = null;
+
+            reader.close();
+            reader = null;
+
+            aggregateWriter.write( "\n" );
+            aggregateWriter.write( content );
         }
         finally
         {
+            IOUtil.close( writer );
             IOUtil.close( reader );
         }
-
-        final String content = writer.toString();
-
-        aggregateWriter.write( "\n" );
-        aggregateWriter.write( content );
     }
 
     protected final Logger getLogger()

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
 Thu May  5 03:22:53 2016
@@ -230,7 +230,8 @@ public class DefaultAssemblyReader
         {
             reader = ReaderFactory.newXmlReader( resourceAsStream );
             final Assembly assembly = readAssembly( reader, ref, null, 
configSource );
-
+            reader.close();
+            reader = null;
             assemblies.add( assembly );
             return assembly;
         }
@@ -267,9 +268,13 @@ public class DefaultAssemblyReader
         try
         {
             r = ReaderFactory.newXmlReader( descriptor );
+
             final Assembly assembly =
                 readAssembly( r, descriptor.getAbsolutePath(), 
descriptor.getParentFile(), configSource );
 
+            r.close();
+            r = null;
+
             assemblies.add( assembly );
 
             return assembly;
@@ -319,6 +324,9 @@ public class DefaultAssemblyReader
 
             final Assembly assembly = readAssembly( r, spec, dir, configSource 
);
 
+            r.close();
+            r = null;
+
             assemblies.add( assembly );
 
             return assembly;
@@ -334,9 +342,9 @@ public class DefaultAssemblyReader
 
     }
 
-    public Assembly readAssembly( final Reader reader, final String 
locationDescription, final File assemblyDir,
+    public Assembly readAssembly( Reader reader, final String 
locationDescription, final File assemblyDir,
                                   final AssemblerConfigurationSource 
configSource )
-                                      throws AssemblyReadException, 
InvalidAssemblerConfigurationException
+        throws AssemblyReadException, InvalidAssemblerConfigurationException
     {
         Assembly assembly;
 
@@ -364,6 +372,8 @@ public class DefaultAssemblyReader
 
             AssemblyInterpolator.checkErrors( AssemblyId.createAssemblyId( 
assembly ), is, getLogger() );
 
+            reader.close();
+            reader = null;
         }
         catch ( final IOException e )
         {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
 Thu May  5 03:22:53 2016
@@ -140,7 +140,10 @@ public final class LineEndingsUtils
                 }
             }
 
-            out.flush();
+            out.close();
+            out = null;
+            in.close();
+            in = null;
         }
         finally
         {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
 Thu May  5 03:22:53 2016
@@ -262,6 +262,7 @@ public class ComponentsXmlArchiverFileFi
         archiver.createArchive();
 
         ZipFile zf = null;
+        FileOutputStream out = null;
         try
         {
             zf = new ZipFile( archiveFile );
@@ -270,16 +271,27 @@ public class ComponentsXmlArchiverFileFi
 
             assertNotNull( ze );
 
-            final FileOutputStream fileStream = new FileOutputStream( 
descriptorFile );
+            out = new FileOutputStream( descriptorFile );
 
-            IOUtil.copy( zf.getInputStream( ze ), fileStream );
-            IOUtil.close( fileStream );
+            IOUtil.copy( zf.getInputStream( ze ), out );
+            out.close();
+            out = null;
+            zf.close();
+            zf = null;
         }
         finally
         {
-            if ( zf != null )
+            IOUtil.close( out );
+            try
             {
-                zf.close();
+                if ( zf != null )
+                {
+                    zf.close();
+                }
+            }
+            catch ( final IOException e )
+            {
+                // Suppressed.
             }
         }
         

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
 Thu May  5 03:22:53 2016
@@ -479,7 +479,8 @@ public class DefaultAssemblyReaderTest
             final ComponentXpp3Writer componentWriter = new 
ComponentXpp3Writer();
 
             componentWriter.write( writer, component );
-            writer.flush();
+            writer.close();
+            writer = null;
         }
         finally
         {
@@ -641,6 +642,8 @@ public class DefaultAssemblyReaderTest
         {
             fw = new OutputStreamWriter( new FileOutputStream( componentsFile 
), "UTF-8" );
             new ComponentXpp3Writer().write( fw, component );
+            fw.close();
+            fw = null;
         }
         finally
         {
@@ -704,6 +707,8 @@ public class DefaultAssemblyReaderTest
         {
             fw = new OutputStreamWriter( new FileOutputStream( componentsFile 
), "UTF-8" );
             new ComponentXpp3Writer().write( fw, component );
+            fw.close();
+            fw = null;
         }
         finally
         {
@@ -814,6 +819,8 @@ public class DefaultAssemblyReaderTest
         {
             writer = new OutputStreamWriter( new FileOutputStream( 
assemblyFile ), "UTF-8" );
             new AssemblyXpp3Writer().write( writer, assembly );
+            writer.close();
+            writer = null;
         }
         finally
         {
@@ -1064,6 +1071,8 @@ public class DefaultAssemblyReaderTest
             {
                 writer = new OutputStreamWriter( new FileOutputStream( 
assemblyFile ), "UTF-8" );
                 new AssemblyXpp3Writer().write( writer, assembly );
+                writer.close();
+                writer = null;
             }
             finally
             {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java
 Thu May  5 03:22:53 2016
@@ -157,6 +157,9 @@ public class TestFileManager
             writer = new FileWriter( file ); // platform encoding
 
             writer.write( contents );
+
+            writer.close();
+            writer = null;
         }
         finally
         {
@@ -182,6 +185,9 @@ public class TestFileManager
             reader = new FileReader( file ); // platform encoding
 
             result = IOUtil.toString( reader );
+
+            reader.close();
+            reader = null;
         }
         finally
         {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java
 Thu May  5 03:22:53 2016
@@ -274,6 +274,9 @@ public class LineEndingsUtilsTest
             sourceWriter = new FileWriter( source );
 
             IOUtil.copy( sourceReader, sourceWriter );
+
+            sourceWriter.close();
+            sourceWriter = null;
         }
         finally
         {
@@ -290,9 +293,15 @@ public class LineEndingsUtilsTest
             destReader = new FileReader( dest );
 
             IOUtil.copy( destReader, destWriter );
+
+            destWriter.close();
+            destWriter = null;
+            destReader.close();
+            destReader = null;
         }
         finally
         {
+            IOUtil.close( destWriter );
             IOUtil.close( destReader );
         }
 

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
 Thu May  5 03:22:53 2016
@@ -89,9 +89,12 @@ public class LinuxLineFeedInputStreamTes
         try
         {
             lf = new LinuxLineFeedInputStream( baos, ensure );
-            byte[] buf = new byte[100];
+            byte[] buf = new byte[ 100 ];
             final int read = lf.read( buf );
-            return new String( buf, 0, read );
+            final String string = new String( buf, 0, read );
+            lf.close();
+            lf = null;
+            return string;
         }
         finally
         {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
 Thu May  5 03:22:53 2016
@@ -90,9 +90,12 @@ public class WindowsLineFeedInputStreamT
         try
         {
             lf = new WindowsLineFeedInputStream( baos, ensure );
-            byte[] buf = new byte[100];
+            byte[] buf = new byte[ 100 ];
             final int read = lf.read( buf );
-            return new String( buf, 0, read );
+            final String string = new String( buf, 0, read );
+            lf.close();
+            lf = null;
+            return string;
         }
         finally
         {

Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -289,7 +289,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
 
     <!-- misc -->

Modified: 
maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/AbstractChangeLogReportTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/AbstractChangeLogReportTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/AbstractChangeLogReportTest.java
 (original)
+++ 
maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/AbstractChangeLogReportTest.java
 Thu May  5 03:22:53 2016
@@ -61,6 +61,8 @@ public abstract class AbstractChangeLogR
             writer = WriterFactory.newXmlWriter( outputHtml );
 
             mojo.getSiteRenderer().generateDocument( writer, 
(SiteRendererSink) mojo.getSink(), context );
+            writer.close();
+            writer = null;
         }
         finally
         {

Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -205,7 +205,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.22</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
 Thu May  5 03:22:53 2016
@@ -365,20 +365,21 @@ public class AnnouncementMailMojo
         throws MojoExecutionException
     {
         InputStreamReader reader = null;
-        FileInputStream inputStream = null;
         try
         {
-            inputStream = new FileInputStream( file );
-
             if ( StringUtils.isEmpty( templateEncoding ) )
             {
                 templateEncoding = ReaderFactory.FILE_ENCODING;
                 getLog().warn( "File encoding has not been set, using platform 
encoding '" + templateEncoding
-                    + "', i.e. build is platform dependent!" );
+                                   + "', i.e. build is platform dependent!" );
+
             }
 
-            reader = new InputStreamReader( inputStream, templateEncoding );
-            return IOUtil.toString( reader );
+            reader = new InputStreamReader( new FileInputStream( file ), 
templateEncoding );
+            final String announcement = IOUtil.toString( reader );
+            reader.close();
+            reader = null;
+            return announcement;
         }
         catch ( FileNotFoundException fnfe )
         {
@@ -394,7 +395,6 @@ public class AnnouncementMailMojo
         }
         finally
         {
-            IOUtil.close( inputStream );
             IOUtil.close( reader );
         }
     }

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
 Thu May  5 03:22:53 2016
@@ -185,7 +185,7 @@ public abstract class AbstractChangesRep
         }
 
         // TODO: push to a helper? Could still be improved by taking more of 
the site information from the site plugin
-        FileOutputStream fileOutputStream = null;
+        Writer writer = null;
         try
         {
             DecorationModel model = new DecorationModel();
@@ -205,11 +205,13 @@ public abstract class AbstractChangesRep
             outputDirectory.mkdirs();
 
             File file = new File( outputDirectory, getOutputName() + ".html" );
-            fileOutputStream = new FileOutputStream( file );
-            Writer writer = new OutputStreamWriter( fileOutputStream, 
getOutputEncoding() );
+            writer = new OutputStreamWriter( new FileOutputStream( file ), 
getOutputEncoding() );
 
             siteRenderer.generateDocument( writer, sink, siteContext );
 
+            writer.close();
+            writer = null;
+
             siteRenderer.copyResources( siteContext, new File( 
project.getBasedir(), "src/site/resources" ),
                                         outputDirectory );
         }
@@ -230,7 +232,7 @@ public abstract class AbstractChangesRep
         }
         finally
         {
-            IOUtils.closeQuietly( fileOutputStream );
+            IOUtils.closeQuietly( writer );
         }
     }
 

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
 Thu May  5 03:22:53 2016
@@ -408,6 +408,8 @@ public class ChangesMojo
                                                 false, encoding, session, 
additionalProperties );
                 mavenFileFilter.copyFile( mavenFileFilterRequest );
                 changesXml = resultFile;
+                xmlStreamReader.close();
+                xmlStreamReader = null;
             }
             catch ( IOException e )
             {
@@ -419,10 +421,7 @@ public class ChangesMojo
             }
             finally
             {
-                if ( xmlStreamReader != null )
-                {
-                    IOUtil.close( xmlStreamReader );
-                }
+                IOUtil.close( xmlStreamReader );
             }
 
         }

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java
 Thu May  5 03:22:53 2016
@@ -100,6 +100,8 @@ public class ChangesXML
 
             fileInputStream = new FileInputStream( xmlPath );
             changesDocument = reader.read( fileInputStream, false );
+            fileInputStream.close();
+            fileInputStream = null;
 
             if ( changesDocument == null )
             {

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/DefaultChangesSchemaValidator.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/DefaultChangesSchemaValidator.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/DefaultChangesSchemaValidator.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/DefaultChangesSchemaValidator.java
 Thu May  5 03:22:53 2016
@@ -74,6 +74,9 @@ public class DefaultChangesSchemaValidat
 
             validator.validate( new StreamSource( reader ) );
 
+            reader.close();
+            reader = null;
+
             return baseHandler;
         }
         catch ( IOException e )
@@ -95,7 +98,7 @@ public class DefaultChangesSchemaValidat
     }
 
     public Schema getSchema( String schemaPath )
-        throws SAXException
+        throws SAXException, IOException
     {
         if ( this.compiledSchemas.containsKey( schemaPath ) )
         {
@@ -114,24 +117,26 @@ public class DefaultChangesSchemaValidat
      * @throws Exception
      */
     private Schema compileJAXPSchema( String uriSchema )
-        throws SAXException, NullPointerException
+        throws IOException, SAXException, NullPointerException
     {
-
-        InputStream is = 
Thread.currentThread().getContextClassLoader().getResourceAsStream( uriSchema );
-
-        if ( is == null )
-        {
-            throw new NullPointerException( " impossible to load schema with 
path " + uriSchema );
-        }
-
+        InputStream in = null;
         try
         {
+            in = 
Thread.currentThread().getContextClassLoader().getResourceAsStream( uriSchema );
+            if ( in == null )
+            {
+                throw new NullPointerException( " impossible to load schema 
with path " + uriSchema );
+            }
+
             //newInstance de SchemaFactory not ThreadSafe
-            return SchemaFactory.newInstance( W3C_XML_SCHEMA ).newSchema( new 
StreamSource( is ) );
+            final Schema schema = SchemaFactory.newInstance( W3C_XML_SCHEMA 
).newSchema( new StreamSource( in ) );
+            in.close();
+            in = null;
+            return schema;
         }
         finally
         {
-            IOUtil.close( is );
+            IOUtil.close( in );
         }
     }
 
@@ -146,6 +151,10 @@ public class DefaultChangesSchemaValidat
         {
             throw new SchemaValidatorException( "SAXException : " + 
e.getMessage(), e );
         }
+        catch ( IOException e )
+        {
+            throw new SchemaValidatorException( "IOException : " + 
e.getMessage(), e );
+        }
 
     }
 }

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
 Thu May  5 03:22:53 2016
@@ -343,6 +343,8 @@ public final class ClassicJiraDownloader
      */
     private void download( final HttpClient cl, final String link )
     {
+        InputStream in = null;
+        OutputStream out = null;
         try
         {
             GetMethod gm = new GetMethod( link );
@@ -383,7 +385,7 @@ public final class ClassicJiraDownloader
 
             if ( gm.getStatusCode() == HttpStatus.SC_OK )
             {
-                final InputStream responseBodyStream = 
gm.getResponseBodyAsStream();
+                in = gm.getResponseBodyAsStream();
 
                 if ( !output.getParentFile().exists() )
                 {
@@ -391,17 +393,12 @@ public final class ClassicJiraDownloader
                 }
 
                 // write the response to file
-                OutputStream out = null;
-                try
-                {
-                    out = new FileOutputStream( output );
-                    IOUtil.copy( responseBodyStream, out );
-                }
-                finally
-                {
-                    IOUtil.close( out );
-                    IOUtil.close( responseBodyStream );
-                }
+                out = new FileOutputStream( output );
+                IOUtil.copy( in, out );
+                out.close();
+                out = null;
+                in.close();
+                in = null;
 
                 getLog().debug( "Downloading from JIRA was successful" );
             }
@@ -433,6 +430,11 @@ public final class ClassicJiraDownloader
                 getLog().error( "Error downloading issues from JIRA. Cause is 
" + e.getLocalizedMessage() );
             }
         }
+        finally
+        {
+            IOUtil.close( out );
+            IOUtil.close( in );
+        }
     }
 
     public List<Issue> getIssueList()

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/announcement/AnnouncementMojoTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/announcement/AnnouncementMojoTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/announcement/AnnouncementMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/announcement/AnnouncementMojoTest.java
 Thu May  5 03:22:53 2016
@@ -65,6 +65,8 @@ public class AnnouncementMojoTest
         FileReader fileReader = new FileReader( new File( 
announcementDirectory, "announcement.vm" ) );
         String result = IOUtil.toString( fileReader );
 
+        fileReader.close();
+
         assertContains( "Nice library", result );
 
         assertContains( "Changes in this version include:", result );

Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -175,7 +175,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
 Thu May  5 03:22:53 2016
@@ -592,6 +592,9 @@ public class CheckstyleViolationCheckMoj
 
                 getLog().warn( "checkstyle:check violations detected but 
failOnViolation set to false" );
             }
+
+            reader.close();
+            reader = null;
         }
         catch ( IOException | XmlPullParserException e )
         {

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
 (original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
 Thu May  5 03:22:53 2016
@@ -24,6 +24,7 @@ import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -505,7 +506,7 @@ public class DefaultCheckstyleExecutor
         throws CheckstyleExecutorException
     {
         Properties p = new Properties();
-
+        InputStream in = null;
         try
         {
             if ( request.getPropertiesLocation() != null )
@@ -518,17 +519,12 @@ public class DefaultCheckstyleExecutor
                 File propertiesFile = locator.getResourceAsFile( 
request.getPropertiesLocation(),
                                                                  
"checkstyle-checker.properties" );
 
-                FileInputStream properties = new FileInputStream( 
propertiesFile );
-                try
-                {
-                    if ( propertiesFile != null )
-                    {
-                        p.load( properties );
-                    }
-                }
-                finally
+                if ( propertiesFile != null )
                 {
-                    IOUtils.closeQuietly( properties );
+                    in = new FileInputStream( propertiesFile );
+                    p.load( in );
+                    in.close();
+                    in = null;
                 }
             }
 
@@ -584,6 +580,10 @@ public class DefaultCheckstyleExecutor
         {
             throw new CheckstyleExecutorException( "Failed to get overriding 
properties", e );
         }
+        finally
+        {
+            IOUtils.closeQuietly( in );
+        }
         if ( request.getSuppressionsFileExpression() != null )
         {
             String suppressionsFilePath = getSuppressionsFilePath( request );

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
 (original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
 Thu May  5 03:22:53 2016
@@ -274,9 +274,11 @@ public class CheckstyleReportTest
         {
             outputHtml.getParentFile().mkdirs();
             writer = WriterFactory.newXmlWriter( outputHtml );
-          
+
             mojo.execute();
-            
+
+            writer.close();
+            writer = null;
         }
         finally
         {

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -177,7 +177,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.22</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
 Thu May  5 03:22:53 2016
@@ -84,6 +84,8 @@ public class AnalyzeDuplicateMojo
         {
             reader = ReaderFactory.newXmlReader( project.getFile() );
             model = pomReader.read( reader );
+            reader.close();
+            reader = null;
         }
         catch ( Exception e )
         {

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
 Thu May  5 03:22:53 2016
@@ -332,6 +332,8 @@ public class BuildClasspathMojo
         {
             w = new BufferedWriter( new FileWriter( out ) );
             w.write( cpString );
+            w.close();
+            w = null;
             getLog().info( "Wrote classpath file '" + out + "'." );
         }
         catch ( IOException ex )
@@ -371,12 +373,15 @@ public class BuildClasspathMojo
         try
         {
             r = new BufferedReader( new FileReader( outputFile ) );
-            String l;
-            while ( ( l = r.readLine() ) != null )
+
+            for ( String line = r.readLine(); line != null; line = 
r.readLine() )
             {
-                sb.append( l );
+                sb.append( line );
             }
 
+            r.close();
+            r = null;
+
             return sb.toString();
         }
         finally

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
 Thu May  5 03:22:53 2016
@@ -131,6 +131,12 @@ public class ResolvePluginsMojo
                     }
                 }
             }
+
+            if ( outputWriter != null )
+            {
+                outputWriter.close();
+                outputWriter = null;
+            }
         }
         catch ( final IOException e )
         {

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
 Thu May  5 03:22:53 2016
@@ -250,6 +250,9 @@ public final class DependencyUtil
             writer = new FileWriter( file, append );
 
             writer.write( string );
+
+            writer.close();
+            writer = null;
         }
         finally
         {

Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -100,7 +100,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>

Modified: 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
 Thu May  5 03:22:53 2016
@@ -267,6 +267,11 @@ public class DeployFileMojo
                             
                             IOUtil.copy( pomInputStream, pomOutputStream );
 
+                            pomOutputStream.close();
+                            pomOutputStream = null;
+                            pomInputStream.close();
+                            pomInputStream = null;
+
                             processModel( readModel( pomFile ) );
 
                             break;
@@ -556,7 +561,10 @@ public class DeployFileMojo
         try
         {
             reader = ReaderFactory.newXmlReader( pomFile );
-            return new MavenXpp3Reader().read( reader );
+            final Model model = new MavenXpp3Reader().read( reader );
+            reader.close();
+            reader = null;
+            return model;
         }
         catch ( FileNotFoundException e )
         {
@@ -594,8 +602,12 @@ public class DeployFileMojo
             tempFile.deleteOnExit();
 
             fw = WriterFactory.newXmlWriter( tempFile );
+
             new MavenXpp3Writer().write( fw, model );
 
+            fw.close();
+            fw = null;
+
             return tempFile;
         }
         catch ( IOException e )

Modified: maven/plugins/trunk/maven-doap-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-doap-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-doap-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -122,7 +122,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: 
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java
 (original)
+++ 
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java
 Thu May  5 03:22:53 2016
@@ -531,6 +531,8 @@ public class DoapUtil
             try
             {
                 in = url.openStream();
+                in.close();
+                in = null;
             }
             finally
             {
@@ -815,6 +817,9 @@ public class DoapUtil
 
             pomProperties.load( is );
 
+            is.close();
+            is = null;
+
             return pomProperties.getProperty( "version", "<unknown>" );
         }
         catch ( IOException e )

Modified: 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java
 Thu May  5 03:22:53 2016
@@ -438,6 +438,9 @@ public class DoapMojoTest
             reader = new FileReader( file );
 
             result = IOUtil.toString( reader );
+
+            reader.close();
+            reader = null;
         }
         finally
         {

Modified: 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java
 (original)
+++ 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java
 Thu May  5 03:22:53 2016
@@ -63,6 +63,9 @@ public class DoapProjectStub
             model =
                 pomReader.read( reader );
             setModel( model );
+
+            reader.close();
+            reader = null;
         }
         catch ( Exception e )
         {

Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-docck-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-docck-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -127,7 +127,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: 
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
 Thu May  5 03:22:53 2016
@@ -285,7 +285,8 @@ public abstract class AbstractCheckDocum
             {
                 writer = new FileWriter( output );
                 writer.write( messages );
-                writer.flush();
+                writer.close();
+                writer = null;
             }
             finally
             {

Modified: 
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
 Thu May  5 03:22:53 2016
@@ -150,6 +150,9 @@ public class CheckPluginDocumentationMoj
 
                 String siteHtml = IOUtil.toString( streamReader );
 
+                streamReader.close();
+                streamReader = null;
+
                 if ( !siteHtml.contains( "href=\"index.html\"" ) )
                 {
                     reporter.error( "site.xml is missing the link to: 
index.html \"Introduction\"." );

Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.22</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -125,7 +125,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -96,7 +96,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: 
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
 Thu May  5 03:22:53 2016
@@ -539,7 +539,10 @@ public class EjbMojo
         try
         {
             xmlReader = new XmlStreamReader( xmlFile );
-            return xmlReader.getEncoding();
+            final String encoding = xmlReader.getEncoding();
+            xmlReader.close();
+            xmlReader = null;
+            return encoding;
         }
         finally
         {

Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-gpg-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -94,7 +94,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.sonatype.plexus</groupId>

Modified: 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
 Thu May  5 03:22:53 2016
@@ -538,7 +538,10 @@ public class SignAndDeployFileMojo
         try
         {
             reader = ReaderFactory.newXmlReader( pomFile );
-            return new MavenXpp3Reader().read( reader );
+            final Model model = new MavenXpp3Reader().read( reader );
+            reader.close();
+            reader = null;
+            return model;
         }
         catch ( FileNotFoundException e )
         {
@@ -576,8 +579,12 @@ public class SignAndDeployFileMojo
             tempFile.deleteOnExit();
 
             fw = WriterFactory.newXmlWriter( tempFile );
+
             new MavenXpp3Writer().write( fw, model );
 
+            fw.close();
+            fw = null;
+
             return tempFile;
         }
         catch ( IOException e )

Modified: maven/plugins/trunk/maven-help-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-help-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -146,7 +146,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.22</version>
+      <version>3.0.23</version>
     </dependency>
 
     <!-- misc -->

Modified: 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
 Thu May  5 03:22:53 2016
@@ -95,7 +95,8 @@ public abstract class AbstractEffectiveM
 
             out.write( content );
 
-            out.flush();
+            out.close();
+            out = null;
         }
         finally
         {

Modified: 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
 Thu May  5 03:22:53 2016
@@ -87,7 +87,8 @@ public abstract class AbstractHelpMojo
 
             out.write( content );
 
-            out.flush();
+            out.close();
+            out = null;
         }
         finally
         {

Modified: 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
 Thu May  5 03:22:53 2016
@@ -593,8 +593,8 @@ public class EvaluateMojo
         try
         {
             jarStream = new JarInputStream( new FileInputStream( jarFile ) );
-            JarEntry jarEntry = jarStream.getNextJarEntry();
-            while ( jarEntry != null )
+            for ( JarEntry jarEntry = jarStream.getNextJarEntry(); jarEntry != 
null;
+                  jarEntry = jarStream.getNextJarEntry() )
             {
                 if ( jarEntry.getName().toLowerCase( Locale.ENGLISH 
).endsWith( ".class" ) )
                 {
@@ -621,8 +621,10 @@ public class EvaluateMojo
                 }
 
                 jarStream.closeEntry();
-                jarEntry = jarStream.getNextJarEntry();
             }
+
+            jarStream.close();
+            jarStream = null;
         }
         catch ( IOException e )
         {

Modified: maven/plugins/trunk/maven-install-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-install-plugin/pom.xml Thu May  5 03:22:53 2016
@@ -138,7 +138,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.23</version>
     </dependency>
   </dependencies>
 

Modified: 
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/DualDigester.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/DualDigester.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/DualDigester.java
 (original)
+++ 
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/DualDigester.java
 Thu May  5 03:22:53 2016
@@ -19,7 +19,6 @@ package org.apache.maven.plugin.install;
  * under the License.
  */
 
-import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -65,12 +64,13 @@ public class DualDigester
         throws MojoExecutionException
     {
         FileInputStream fis = null;
-        BufferedInputStream bis = null;
 
         try
         {
             fis = new FileInputStream( file );
             calculate( fis );
+            fis.close();
+            fis = null;
         }
         catch ( IOException e )
         {
@@ -78,7 +78,6 @@ public class DualDigester
         }
         finally
         {
-            IOUtil.close( bis );
             IOUtil.close( fis );
         }
     }