You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/05/05 03:22:55 UTC
svn commit: r1742353 [3/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/...
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.java Thu May 5 03:22:53 2016
@@ -60,10 +60,19 @@ public class IncludeResourceTransformer
public void modifyOutputStream( JarOutputStream jos )
throws IOException
{
- jos.putNextEntry( new JarEntry( resource ) );
+ InputStream in = null;
+ try
+ {
+ jos.putNextEntry( new JarEntry( resource ) );
- InputStream in = new FileInputStream( file );
- IOUtil.copy( in, jos );
- in.close();
+ in = new FileInputStream( file );
+ IOUtil.copy( in, jos );
+ in.close();
+ in = null;
+ }
+ finally
+ {
+ IOUtil.close( in );
+ }
}
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java Thu May 5 03:22:53 2016
@@ -167,6 +167,9 @@ public class PluginXmlResourceTransforme
}
Xpp3DomWriter.write( writer, dom );
+
+ writer.close();
+ writer = null;
}
finally
{
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -293,7 +293,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>
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java Thu May 5 03:22:53 2016
@@ -106,10 +106,14 @@ public abstract class AbstractSiteMojo
// if this ever changes, we will have to revisit this code.
final Properties properties = new Properties();
final String corePomProperties = "META-INF/maven/org.apache.maven/maven-core/pom.properties";
- final InputStream in = MavenProject.class.getClassLoader().getResourceAsStream( corePomProperties );
- try
+
+ InputStream in = null;
+ try
{
+ in = MavenProject.class.getClassLoader().getResourceAsStream( corePomProperties );
properties.load( in );
+ in.close();
+ in = null;
}
catch ( IOException ioe )
{
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java Thu May 5 03:22:53 2016
@@ -180,7 +180,8 @@ public class EffectiveSiteMojo
out.write( content );
- out.flush();
+ out.close();
+ out = null;
}
finally
{
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorArtifactMetadata.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorArtifactMetadata.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorArtifactMetadata.java Thu May 5 03:22:53 2016
@@ -83,6 +83,8 @@ public class SiteDescriptorArtifactMetad
{
writer = WriterFactory.newXmlWriter( destination );
new DecorationXpp3Writer().write( writer, decoration );
+ writer.close();
+ writer = null;
}
catch ( IOException e )
{
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java Thu May 5 03:22:53 2016
@@ -285,11 +285,19 @@ public class ReportDocumentRenderer
{
out = WriterFactory.newWriter( outputFile, siteRenderingContext.getOutputEncoding() );
renderer.generateDocument( out, mySink, siteRenderingContext );
+ mySink.close();
+ mySink = null;
+ out.close();
+ out = null;
}
finally
{
- mySink.close();
IOUtil.close( out );
+
+ if ( mySink != null )
+ {
+ mySink.close();
+ }
}
}
}
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java Thu May 5 03:22:53 2016
@@ -129,6 +129,10 @@ public class SiteRunMojo
inStream = getClass().getResourceAsStream( "/run/web.xml" );
outStream = new FileOutputStream( webXml );
IOUtil.copy( inStream, outStream );
+ outStream.close();
+ outStream = null;
+ inStream.close();
+ inStream = null;
}
catch ( FileNotFoundException e )
{
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java Thu May 5 03:22:53 2016
@@ -50,6 +50,8 @@ public class SiteMavenProjectStub
{
reader = ReaderFactory.newXmlReader( new File( getBasedir(), "pom.xml" ) );
setModel( new MavenXpp3Reader().read( reader ) );
+ reader.close();
+ reader = null;
}
catch ( Exception e )
{
Modified: maven/plugins/trunk/maven-source-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-source-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -119,7 +119,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>
Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java Thu May 5 03:22:53 2016
@@ -131,7 +131,10 @@ public class Project001Stub
try
{
reader = ReaderFactory.newXmlReader( file );
- return pomReader.read( reader );
+ final Model model = pomReader.read( reader );
+ reader.close();
+ reader = null;
+ return model;
}
finally
{
Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-stage-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -112,7 +112,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>commons-io</groupId>
Modified: maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java (original)
+++ maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java Thu May 5 03:22:53 2016
@@ -222,7 +222,7 @@ public class DefaultRepositoryCopier
rw.print( s + "\n" );
}
- IOUtil.close( rw );
+ rw.close();
ZipEntry e = new ZipEntry( renameScript.getName() );
@@ -232,9 +232,8 @@ public class DefaultRepositoryCopier
IOUtil.copy( is, zos );
- IOUtil.close( is );
-
- IOUtil.close( zos );
+ zos.close();
+ is.close();
sourceWagon.disconnect();
@@ -325,7 +324,7 @@ public class DefaultRepositoryCopier
IOUtil.copy( is, zos );
- IOUtil.close( is );
+ is.close();
int idx = s.indexOf( IN_PROCESS_MARKER );
@@ -364,11 +363,10 @@ public class DefaultRepositoryCopier
this.writer.write( writer, existing );
- IOUtil.close( writer );
-
- IOUtil.close( stagedMetadataReader );
+ writer.close();
+ stagedMetadataReader.close();
+ existingMetadataReader.close();
- IOUtil.close( existingMetadataReader );
// Mark all metadata as in-process and regenerate the checksums as they will be different
// after the merger
@@ -414,12 +412,12 @@ public class DefaultRepositoryCopier
int i;
- while ( ( i = is.read( buf ) ) > 0 )
+ while ( ( i = is.read( buf ) ) >= 0 )
{
md5.update( buf, 0, i );
}
- IOUtil.close( is );
+ is.close();
return encode( md5.digest() );
}
Modified: maven/plugins/trunk/maven-stage-plugin/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java (original)
+++ maven/plugins/trunk/maven-stage-plugin/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java Thu May 5 03:22:53 2016
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.stage;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.wagon.repository.Repository;
@@ -126,6 +125,6 @@ public class RepositoryCopierTest
assertTrue( versions.contains( "2.0.5" ) );
- IOUtil.close( r );
+ r.close();
}
}
Modified: maven/plugins/trunk/maven-verifier-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-verifier-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-verifier-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -83,7 +83,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>
</dependencies>
Modified: maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugins/verifier/VerifierMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugins/verifier/VerifierMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugins/verifier/VerifierMojo.java (original)
+++ maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugins/verifier/VerifierMojo.java Thu May 5 03:22:53 2016
@@ -113,6 +113,9 @@ public class VerifierMojo
VerificationsXpp3Reader xppReader = new VerificationsXpp3Reader();
Verifications verifications = xppReader.read( reader );
+ reader.close();
+ reader = null;
+
for ( org.apache.maven.plugin.verifier.model.File file : verifications.getFiles() )
{
// Transform the file to check into an absolute path prefixing the basedir if
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.22</version>
+ <version>3.0.23</version>
</dependency>
<dependency>
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java Thu May 5 03:22:53 2016
@@ -79,6 +79,8 @@ public class WarManifestMojo
Manifest mf = ma.getManifest( getSession(), getProject(), getArchive() );
printWriter = new PrintWriter( WriterFactory.newWriter( manifestFile, WriterFactory.UTF_8 ) );
mf.write( printWriter );
+ printWriter.close();
+ printWriter = null;
}
catch ( ManifestException e )
{
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java Thu May 5 03:22:53 2016
@@ -75,7 +75,10 @@ public class WebappStructureSerializer
try
{
reader = ReaderFactory.newXmlReader( file );
- return (WebappStructure) XSTREAM.fromXML( reader );
+ final WebappStructure webappStructure = (WebappStructure) XSTREAM.fromXML( reader );
+ reader.close();
+ reader = null;
+ return webappStructure;
}
finally
{
@@ -108,6 +111,8 @@ public class WebappStructureSerializer
}
writer = WriterFactory.newXmlWriter( targetFile );
XSTREAM.toXML( webappStructure, writer );
+ writer.close();
+ writer = null;
}
finally
{