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 [2/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-install-plugin/src/test/java/org/apache/maven/plugin/install/SimpleDigester.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/SimpleDigester.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/SimpleDigester.java (original)
+++ maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/SimpleDigester.java Thu May 5 03:22:53 2016
@@ -57,17 +57,16 @@ public class SimpleDigester
public String calculate( File file )
throws MojoExecutionException
{
- FileInputStream fis = null;
- BufferedInputStream bis = null;
-
+ InputStream in = null;
try
{
- fis = new FileInputStream( file );
- int bufsiz = (int) Math.min( file.length(), bufsize );
- bis = new BufferedInputStream( fis, bufsiz );
+ in = new BufferedInputStream( new FileInputStream( file ), (int) Math.min( file.length(), bufsize ) );
messageDigest.reset();
- update( bis );
- return Hex.encodeHexString( messageDigest.digest() );
+ update( in );
+ final String hexString = Hex.encodeHexString( messageDigest.digest() );
+ in.close();
+ in = null;
+ return hexString;
}
catch ( IOException e )
{
@@ -76,8 +75,7 @@ public class SimpleDigester
}
finally
{
- IOUtil.close( bis );
- IOUtil.close( fis );
+ IOUtil.close( in );
}
}
Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -176,7 +176,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.21</version>
+ <version>3.0.23</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Thu May 5 03:22:53 2016
@@ -1202,6 +1202,8 @@ public abstract class AbstractInvokerMoj
{
fileWriter = new FileWriter( mergedSettingsFile );
settingsWriter.write( fileWriter, mergedSettings );
+ fileWriter.close();
+ fileWriter = null;
}
finally
{
@@ -1871,6 +1873,8 @@ public abstract class AbstractInvokerMoj
Properties loadedProperties = new Properties();
loadedProperties.load( fin );
+ fin.close();
+ fin = null;
collectedTestProperties.putAll( loadedProperties );
}
catch ( IOException e )
@@ -2286,11 +2290,13 @@ public abstract class AbstractInvokerMoj
Map<String, Object> composite = getInterpolationValueSource();
reader = new BufferedReader( new InterpolationFilterReader( newReader( tokenFile ), composite ) );
- String line;
- while ( ( line = reader.readLine() ) != null )
+ for ( String line = reader.readLine(); line != null; line = reader.readLine() )
{
result.addAll( collectListFromCSV( line ) );
}
+
+ reader.close();
+ reader = null;
}
finally
{
@@ -2346,9 +2352,13 @@ public abstract class AbstractInvokerMoj
{
// interpolation with token @...@
Map<String, Object> composite = getInterpolationValueSource();
- reader = ReaderFactory.newXmlReader( originalFile );
- reader = new InterpolationFilterReader( reader, composite, "@", "@" );
+ reader =
+ new InterpolationFilterReader( ReaderFactory.newXmlReader( originalFile ), composite, "@", "@" );
+
xml = IOUtil.toString( reader );
+
+ reader.close();
+ reader = null;
}
finally
{
@@ -2361,7 +2371,8 @@ public abstract class AbstractInvokerMoj
interpolatedFile.getParentFile().mkdirs();
writer = WriterFactory.newXmlWriter( interpolatedFile );
writer.write( xml );
- writer.flush();
+ writer.close();
+ writer = null;
}
finally
{
@@ -2395,6 +2406,8 @@ public abstract class AbstractInvokerMoj
{
in = new FileInputStream( propertiesFile );
props.load( in );
+ in.close();
+ in = null;
}
catch ( IOException e )
{
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java Thu May 5 03:22:53 2016
@@ -145,17 +145,18 @@ class MetadataUtils
return null;
}
- Reader reader = ReaderFactory.newXmlReader( metadataFile );
+ Reader reader = null;
try
{
- try
- {
- return Xpp3DomBuilder.build( reader );
- }
- catch ( XmlPullParserException e )
- {
- throw (IOException) new IOException( e.getMessage() ).initCause( e );
- }
+ reader = ReaderFactory.newXmlReader( metadataFile );
+ final Xpp3Dom xpp3Dom = Xpp3DomBuilder.build( reader );
+ reader.close();
+ reader = null;
+ return xpp3Dom;
+ }
+ catch ( XmlPullParserException e )
+ {
+ throw (IOException) new IOException( e.getMessage() ).initCause( e );
}
finally
{
@@ -168,10 +169,13 @@ class MetadataUtils
{
metadataFile.getParentFile().mkdirs();
- Writer writer = WriterFactory.newXmlWriter( metadataFile );
+ Writer writer = null;
try
{
+ writer = WriterFactory.newXmlWriter( metadataFile );
Xpp3DomWriter.write( writer, metadata );
+ writer.close();
+ writer = null;
}
finally
{
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/PomUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/PomUtils.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/PomUtils.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/PomUtils.java Thu May 5 03:22:53 2016
@@ -52,7 +52,10 @@ class PomUtils
try
{
reader = ReaderFactory.newXmlReader( pomFile );
- return new MavenXpp3Reader().read( reader, false );
+ final Model model = new MavenXpp3Reader().read( reader, false );
+ reader.close();
+ reader = null;
+ return model;
}
catch ( XmlPullParserException e )
{
Modified: maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java Thu May 5 03:22:53 2016
@@ -94,12 +94,14 @@ public class InterpolationTest
String content = IOUtil.toString( reader );
assertTrue( content.indexOf( "<interpolateValue>bar</interpolateValue>" ) > 0 );
reader.close();
+ reader = null;
// recreate it to test delete if exists before creation
invokerMojo.buildInterpolatedFile( new File( dirPath, "pom.xml" ), interpolatedPomFile );
reader = ReaderFactory.newXmlReader( interpolatedPomFile );
content = IOUtil.toString( reader );
assertTrue( content.indexOf( "<interpolateValue>bar</interpolateValue>" ) > 0 );
reader.close();
+ reader = null;
}
finally
{
Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -109,7 +109,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>junit</groupId>
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -230,7 +230,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>
<!-- test -->
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Thu May 5 03:22:53 2016
@@ -55,7 +55,6 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
@@ -738,14 +737,12 @@ public abstract class AbstractFixJavadoc
clirrNewClasses = new LinkedList<String>();
clirrNewMethods = new LinkedHashMap<String, List<String>>();
- BufferedReader input = null;
- Reader reader = null;
+ BufferedReader reader = null;
try
{
- reader = ReaderFactory.newReader( clirrTextOutputFile, "UTF-8" );
- input = new BufferedReader( reader );
- String line;
- while ( ( line = input.readLine() ) != null )
+ reader = new BufferedReader( ReaderFactory.newReader( clirrTextOutputFile, "UTF-8" ) );
+
+ for ( String line = reader.readLine(); line != null; line = reader.readLine() )
{
String[] split = StringUtils.split( line, ":" );
if ( split.length != 4 )
@@ -818,11 +815,13 @@ public abstract class AbstractFixJavadoc
}
// CHECKSTYLE_ON: MagicNumber
}
+
+ reader.close();
+ reader = null;
}
finally
{
IOUtils.closeQuietly( reader );
- IOUtils.closeQuietly( input );
}
if ( clirrNewClasses.isEmpty() && clirrNewMethods.isEmpty() )
{
@@ -986,9 +985,8 @@ public abstract class AbstractFixJavadoc
{
reader = new BufferedReader( new StringReader( originalContent ) );
- String line;
int lineNumber = 0;
- while ( ( line = reader.readLine() ) != null )
+ for ( String line = reader.readLine(); line != null; line = reader.readLine() )
{
lineNumber++;
final String indent = autodetectIndentation( line );
@@ -1047,6 +1045,9 @@ public abstract class AbstractFixJavadoc
stringWriter.write( line );
stringWriter.write( EOL );
}
+
+ reader.close();
+ reader = null;
}
finally
{
@@ -2941,6 +2942,8 @@ public abstract class AbstractFixJavadoc
{
writer = WriterFactory.newWriter( javaFile, encoding );
writer.write( StringUtils.unifyLineSeparators( content ) );
+ writer.close();
+ writer = null;
}
finally
{
@@ -2970,7 +2973,8 @@ public abstract class AbstractFixJavadoc
{
Properties properties = new Properties();
properties.load( resourceAsStream );
-
+ resourceAsStream.close();
+ resourceAsStream = null;
if ( StringUtils.isNotEmpty( properties.getProperty( "version" ) ) )
{
clirrVersion = properties.getProperty( "version" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Thu May 5 03:22:53 2016
@@ -5226,14 +5226,17 @@ public abstract class AbstractJavadocMoj
throws IOException
{
final String fixData;
- final InputStream in = this.getClass().getResourceAsStream( "frame-injection-fix.txt" );
- if ( in == null )
- {
- throw new FileNotFoundException( "Missing resource 'frame-injection-fix.txt' in classpath." );
- }
+ InputStream in = null;
try
{
+ in = this.getClass().getResourceAsStream( "frame-injection-fix.txt" );
+ if ( in == null )
+ {
+ throw new FileNotFoundException( "Missing resource 'frame-injection-fix.txt' in classpath." );
+ }
fixData = StringUtils.unifyLineSeparators( IOUtil.toString( in, "US-ASCII" ) ).trim();
+ in.close();
+ in = null;
}
finally
{
@@ -5412,7 +5415,8 @@ public abstract class AbstractJavadocMoj
{
Properties properties = new Properties();
properties.load( resourceAsStream );
-
+ resourceAsStream.close();
+ resourceAsStream = null;
if ( StringUtils.isNotEmpty( properties.getProperty( "version" ) ) )
{
javadocPluginVersion = properties.getProperty( "version" );
@@ -5699,12 +5703,17 @@ public abstract class AbstractJavadocMoj
link.setLocation( javaApiPackageListFile.getParentFile().getAbsolutePath() );
link.setUrl( javaApiLink );
- InputStream in = this.getClass().getResourceAsStream( "java-api-package-list-" + apiVersion );
+ InputStream in = null;
OutputStream out = null;
try
{
+ in = this.getClass().getResourceAsStream( "java-api-package-list-" + apiVersion );
out = new FileOutputStream( javaApiPackageListFile );
IOUtil.copy( in, out );
+ out.close();
+ out = null;
+ in.close();
+ in = null;
}
catch ( IOException ioe )
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java Thu May 5 03:22:53 2016
@@ -780,8 +780,10 @@ public class JavadocUtil
try
{
osw = new OutputStreamWriter( ost, charsetName );
+ osw.close();
+ osw = null;
}
- catch ( UnsupportedEncodingException exc )
+ catch ( IOException exc )
{
return false;
}
@@ -895,29 +897,35 @@ public class JavadocUtil
throw new IOException( "The url could not be null." );
}
- InputStream is = url.openStream();
- if ( is == null )
- {
- throw new IOException( "The resource " + url + " doesn't exists." );
- }
-
if ( !file.getParentFile().exists() )
{
file.getParentFile().mkdirs();
}
- OutputStream os = null;
+ InputStream in = null;
+ OutputStream out = null;
try
{
- os = new FileOutputStream( file );
+ in = url.openStream();
+
+ if ( in == null )
+ {
+ throw new IOException( "The resource " + url + " doesn't exists." );
+ }
- IOUtil.copy( is, os );
+ out = new FileOutputStream( file );
+
+ IOUtil.copy( in, out );
+
+ out.close();
+ out = null;
+ in.close();
+ in = null;
}
finally
{
- IOUtil.close( is );
-
- IOUtil.close( os );
+ IOUtil.close( in );
+ IOUtil.close( out );
}
}
@@ -1150,8 +1158,9 @@ public class JavadocUtil
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" ) )
{
@@ -1161,8 +1170,10 @@ public class JavadocUtil
}
jarStream.closeEntry();
- jarEntry = jarStream.getNextJarEntry();
}
+
+ jarStream.close();
+ jarStream = null;
}
finally
{
@@ -1731,8 +1742,7 @@ public class JavadocUtil
if ( validateContent )
{
- String line;
- while ( ( line = reader.readLine() ) != null )
+ for ( String line = reader.readLine(); line != null; line = reader.readLine() )
{
if ( !isValidPackageName( line ) )
{
@@ -1741,6 +1751,9 @@ public class JavadocUtil
}
}
+ reader.close();
+ reader = null;
+
return true;
}
finally
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java Thu May 5 03:22:53 2016
@@ -196,7 +196,8 @@ public final class ResourceResolver
{
stream = new FileInputStream( optionsFile );
JavadocOptions options = new JavadocOptionsXpp3Reader().read( stream );
-
+ stream.close();
+ stream = null;
bundles.add( new JavadocBundle( options, new File( project.getBasedir(),
options.getJavadocResourcesDirectory() ) ) );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java Thu May 5 03:22:53 2016
@@ -721,7 +721,10 @@ public class FixJavadocMojoTest
try
{
fileReader = ReaderFactory.newReader( file, "UTF-8" );
- return IOUtil.toString( fileReader );
+ final String content = IOUtil.toString( fileReader );
+ fileReader.close();
+ fileReader = null;
+ return content;
}
finally
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java Thu May 5 03:22:53 2016
@@ -343,6 +343,8 @@ public class JavadocReportTest
{
reader = ReaderFactory.newPlatformReader( options );
contentOptions = IOUtil.toString( reader );
+ reader.close();
+ reader = null;
}
finally
{
Modified: maven/plugins/trunk/maven-jdeps-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jdeps-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jdeps-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -86,7 +86,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.21</version>
+ <version>3.0.23</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: maven/plugins/trunk/maven-linkcheck-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-linkcheck-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-linkcheck-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -164,7 +164,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-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java (original)
+++ maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java Thu May 5 03:22:53 2016
@@ -137,6 +137,8 @@ public class SiteInvoker
{
writer = WriterFactory.newXmlWriter( tmpProjectFile );
clone.writeOriginalModel( writer );
+ writer.close();
+ writer = null;
}
finally
{
@@ -225,6 +227,8 @@ public class SiteInvoker
{
reader = ReaderFactory.newReader( invokerLog, "UTF-8" );
invokerLogContent = IOUtil.toString( reader );
+ reader.close();
+ reader = null;
}
catch ( IOException e )
{
Modified: maven/plugins/trunk/maven-patch-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-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.20</version>
+ <version>3.0.23</version>
</dependency>
<!-- Others -->
Modified: maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java Thu May 5 03:22:53 2016
@@ -518,7 +518,8 @@ public class ApplyMojo
}
}
- writer.flush();
+ writer.close();
+ writer = null;
}
catch ( IOException e )
{
Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -206,7 +206,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-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentDescriptorReader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentDescriptorReader.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentDescriptorReader.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentDescriptorReader.java Thu May 5 03:22:53 2016
@@ -137,10 +137,13 @@ public class DocumentDescriptorReader
final String interpolatedDoc = interpolator.interpolate( IOUtil.toString( reader ) );
+ reader.close();
+ reader = null;
+
if ( log != null && log.isDebugEnabled() )
{
log.debug( "Interpolated document descriptor ("
- + docDescriptor.getAbsolutePath() + ")\n" + interpolatedDoc );
+ + docDescriptor.getAbsolutePath() + ")\n" + interpolatedDoc );
}
// No Strict
Modified: maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java Thu May 5 03:22:53 2016
@@ -846,6 +846,10 @@ public class PdfMojo
String enc = reader.getEncoding();
String siteDescriptorContent = IOUtil.toString( reader );
+
+ reader.close();
+ reader = null;
+
siteDescriptorContent =
siteTool.getInterpolatedSiteDescriptorContent( new HashMap<String, String>( 2 ), project,
siteDescriptorContent );
@@ -966,7 +970,8 @@ public class PdfMojo
{
w = WriterFactory.newXmlWriter( doc );
xpp3.write( w, docModel );
-
+ w.close();
+ w = null;
getLog().debug( "Generated a default document model: " + doc.getAbsolutePath() );
}
catch ( IOException e )
@@ -1417,6 +1422,9 @@ public class PdfMojo
reader = ReaderFactory.newXmlReader( f );
doxia.parse( reader, f.getParentFile().getName(), titleSink );
+
+ reader.close();
+ reader = null;
}
catch ( ParseException e )
{
@@ -1457,6 +1465,9 @@ public class PdfMojo
reader = ReaderFactory.newXmlReader( generatedReport );
doxia.parse( reader, generatedReport.getParentFile().getName(), sinkAdapter );
+
+ reader.close();
+ reader = null;
}
catch ( ParseException e )
{
@@ -1633,12 +1644,16 @@ public class PdfMojo
// and that should have a pom.properties file
// if this ever changes, we will have to revisit this code.
final Properties properties = new Properties();
- final InputStream in =
- MavenProject.class.getClassLoader().getResourceAsStream( "META-INF/maven/org.apache.maven/maven-core/"
- + "pom.properties" );
+
+ InputStream in = null;
try
{
+ in = MavenProject.class.getClassLoader().getResourceAsStream( "META-INF/maven/org.apache.maven/maven-core/"
+ + "pom.properties" );
+
properties.load( in );
+ in.close();
+ in = null;
}
catch ( IOException ioe )
{
@@ -1681,6 +1696,9 @@ public class PdfMojo
writer = WriterFactory.newXmlWriter( toFile );
// see PdfSink#table()
writer.write( StringUtils.replace( content, "<table><table", "<table" ) );
+
+ writer.close();
+ writer = null;
}
finally
{
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java Thu May 5 03:22:53 2016
@@ -28,7 +28,6 @@ import org.apache.maven.doxia.document.D
import org.apache.maven.doxia.document.DocumentMeta;
import org.apache.maven.doxia.document.DocumentModel;
import org.apache.maven.doxia.document.DocumentTOC;
-import org.apache.maven.doxia.document.DocumentTOCItem;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
import org.apache.maven.plugins.pdf.stubs.ModelBuilderMavenProjectStub;
@@ -118,15 +117,17 @@ public class DocumentModelBuilderTest
}
private DecorationModel getDecorationModelFromFile( File descriptorFile )
- throws IOException, XmlPullParserException
+ throws IOException, XmlPullParserException
{
Reader reader = null;
try
{
reader = ReaderFactory.newXmlReader( descriptorFile );
-
- return new DecorationXpp3Reader().read( reader );
+ final DecorationModel decorationModel = new DecorationXpp3Reader().read( reader );
+ reader.close();
+ reader = null;
+ return decorationModel;
}
finally
{
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java Thu May 5 03:22:53 2016
@@ -124,6 +124,8 @@ public class PdfMojoTest
{
reader = ReaderFactory.newXmlReader( foFile );
foContent = IOUtil.toString( reader );
+ reader.close();
+ reader = null;
}
finally
{
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/DefaultMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/DefaultMavenProjectStub.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/DefaultMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/DefaultMavenProjectStub.java Thu May 5 03:22:53 2016
@@ -47,8 +47,10 @@ public class DefaultMavenProjectStub
try
{
reader = ReaderFactory.newXmlReader( getFile() );
- Model model = pomReader.read( reader );
+ final Model model = pomReader.read( reader );
setModel( model );
+ reader.close();
+ reader = null;
}
catch ( Exception e )
{
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/FilteringMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/FilteringMavenProjectStub.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/FilteringMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/FilteringMavenProjectStub.java Thu May 5 03:22:53 2016
@@ -48,8 +48,10 @@ public class FilteringMavenProjectStub
try
{
reader = ReaderFactory.newXmlReader( getFile() );
- Model model = pomReader.read( reader );
+ final Model model = pomReader.read( reader );
setModel( model );
+ reader.close();
+ reader = null;
}
catch ( Exception e )
{
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ITextMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ITextMavenProjectStub.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ITextMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ITextMavenProjectStub.java Thu May 5 03:22:53 2016
@@ -47,8 +47,10 @@ public class ITextMavenProjectStub
try
{
reader = ReaderFactory.newXmlReader( getFile() );
- Model model = pomReader.read( reader );
+ final Model model = pomReader.read( reader );
setModel( model );
+ reader.close();
+ reader = null;
}
catch ( Exception e )
{
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java Thu May 5 03:22:53 2016
@@ -47,9 +47,12 @@ public class ModelBuilderMavenProjectStu
{
reader = new XmlStreamReader( getFile() );
- Model model = new MavenXpp3Reader().read( reader );
+ final Model model = new MavenXpp3Reader().read( reader );
setModel( model );
+ reader.close();
+ reader = null;
+
setGroupId( model.getGroupId() );
setArtifactId( model.getArtifactId() );
setVersion( model.getVersion() );
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -180,7 +180,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.21</version>
+ <version>3.0.23</version>
</dependency>
<!-- pmd -->
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java Thu May 5 03:22:53 2016
@@ -339,6 +339,9 @@ public class CpdReport
writer = new OutputStreamWriter( tStream, getOutputEncoding() );
writer.write( buffer );
writer.close();
+ writer = null;
+ tStream.close();
+ tStream = null;
if ( includeXmlInSite )
{
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java Thu May 5 03:22:53 2016
@@ -516,6 +516,9 @@ public class PmdReport
r.renderFileReport( report );
r.end();
writer.close();
+ writer = null;
+ tStream.close();
+ tStream = null;
if ( includeXmlInSite )
{
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java Thu May 5 03:22:53 2016
@@ -100,6 +100,8 @@ public class PmdViolationCheckMojo
{
fileInputStream = new FileInputStream( new File( excludeFromFailureFile ) );
props.load( fileInputStream );
+ fileInputStream.close();
+ fileInputStream = null;
}
catch ( final IOException e )
{
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java Thu May 5 03:22:53 2016
@@ -63,6 +63,9 @@ public abstract class AbstractPmdReportT
writer = WriterFactory.newXmlWriter( outputHtml );
mojo.getSiteRenderer().generateDocument( writer, (SiteRendererSink) mojo.getSink(), context );
+
+ writer.close();
+ writer = null;
}
finally
{
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java Thu May 5 03:22:53 2016
@@ -333,29 +333,28 @@ public class PmdReportTest
private String readFile( File file )
throws IOException
{
- String strTmp;
- StringBuilder str = new StringBuilder( (int) file.length() );
- FileReader reader = null;
- BufferedReader in = null;
+ BufferedReader reader = null;
try
{
- reader = new FileReader( file );
- in = new BufferedReader( reader );
+ reader = new BufferedReader( new FileReader( file ) );
- while ( ( strTmp = in.readLine() ) != null )
+ final StringBuilder str = new StringBuilder( (int) file.length() );
+
+ for ( String line = reader.readLine(); line != null; line = reader.readLine() )
{
str.append( ' ' );
- str.append( strTmp );
+ str.append( line );
}
- in.close();
+
+ reader.close();
+ reader = null;
+
+ return str.toString();
}
finally
{
- IOUtil.close( in );
IOUtil.close( reader );
}
-
- return str.toString();
}
/**
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java Thu May 5 03:22:53 2016
@@ -54,6 +54,8 @@ public class DefaultConfigurationMavenPr
{
reader = new FileReader( new File( getBasedir() + "/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ) );
model = pomReader.read( reader );
+ reader.close();
+ reader = null;
setModel( model );
}
catch ( Exception e )
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -333,7 +333,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-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Thu May 5 03:22:53 2016
@@ -241,6 +241,9 @@ public abstract class AbstractProjectInf
siteRenderer.copyResources( siteContext, new File( project.getBasedir(), "src/site/resources" ),
outputDirectory );
+
+ writer.close();
+ writer = null;
}
catch ( RendererException e )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java Thu May 5 03:22:53 2016
@@ -19,6 +19,15 @@ package org.apache.maven.report.projecti
* under the License.
*/
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.OutputStream;
+import java.util.Locale;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.manager.WagonManager;
@@ -42,14 +51,6 @@ import org.apache.maven.shared.jar.class
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.util.Locale;
-
/**
* Generates the Project Dependencies report.
*
@@ -244,7 +245,9 @@ public class DependenciesReport
throws IOException
{
InputStream resourceList = null;
- LineNumberReader reader = null;
+ InputStream in = null;
+ BufferedReader reader = null;
+ OutputStream out = null;
try
{
resourceList = getClass().getClassLoader().getResourceAsStream( RESOURCES_DIR + "/resources.txt" );
@@ -253,13 +256,11 @@ public class DependenciesReport
{
reader = new LineNumberReader( new InputStreamReader( resourceList, ReaderFactory.US_ASCII ) );
- String line = reader.readLine();
-
- while ( line != null )
+ for ( String line = reader.readLine(); line != null; line = reader.readLine() )
{
- InputStream is = getClass().getClassLoader().getResourceAsStream( RESOURCES_DIR + "/" + line );
+ in = getClass().getClassLoader().getResourceAsStream( RESOURCES_DIR + "/" + line );
- if ( is == null )
+ if ( in == null )
{
throw new IOException( "The resource " + line + " doesn't exist." );
}
@@ -271,27 +272,24 @@ public class DependenciesReport
outputFile.getParentFile().mkdirs();
}
- FileOutputStream w = null;
- try
- {
- w = new FileOutputStream( outputFile );
- IOUtil.copy( is, w );
- }
- finally
- {
- IOUtil.close( is );
-
- IOUtil.close( w );
- }
-
- line = reader.readLine();
+ out = new FileOutputStream( outputFile );
+ IOUtil.copy( in, out );
+ out.close();
+ out = null;
+ in.close();
+ in = null;
}
+
+ reader.close();
+ reader = null;
}
}
finally
{
- IOUtil.close( resourceList );
+ IOUtil.close( out );
IOUtil.close( reader );
+ IOUtil.close( in );
+ IOUtil.close( resourceList );
}
}
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java Thu May 5 03:22:53 2016
@@ -139,7 +139,12 @@ public class ProjectInfoReportUtils
URLConnection conn = url.openConnection();
in = conn.getInputStream();
- return IOUtil.toString( in, encoding );
+ final String content = IOUtil.toString( in, encoding );
+
+ in.close();
+ in = null;
+
+ return content;
}
finally
{
@@ -193,7 +198,12 @@ public class ProjectInfoReportUtils
URLConnection conn = getURLConnection( url, project, settings );
in = conn.getInputStream();
- return IOUtil.toString( in, encoding );
+ final String string = IOUtil.toString( in, encoding );
+
+ in.close();
+ in = null;
+
+ return string;
}
finally
{
Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-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.apache.maven.shared</groupId>
Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -141,7 +141,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>
<!-- other -->
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java Thu May 5 03:22:53 2016
@@ -150,6 +150,9 @@ public class BundleRemoteResourcesMojo
writer = new FileWriter( f );
w.write( writer, remoteResourcesBundle );
+
+ writer.close();
+ writer = null;
}
catch ( IOException e )
{
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java Thu May 5 03:22:53 2016
@@ -836,6 +836,10 @@ public class ProcessRemoteResourcesMojo
}
velocity.evaluate( context, writer, "", reader );
+ writer.close();
+ writer = null;
+ reader.close();
+ reader = null;
}
catch ( ParseErrorException e )
{
@@ -909,16 +913,20 @@ public class ProcessRemoteResourcesMojo
if ( file.exists() )
{
- InputStream is = new FileInputStream( file );
- InputStream newContents = new ByteArrayInputStream( outStream.getData() );
+ InputStream is = null;
try
{
+ is = new FileInputStream( file );
+ final InputStream newContents = new ByteArrayInputStream( outStream.getData() );
needOverwrite = !IOUtil.contentEquals( is, newContents );
if ( getLog().isDebugEnabled() )
{
getLog().debug( "File " + file + " contents "
- + ( needOverwrite ? "differs" : "does not differ" ) );
+ + ( needOverwrite ? "differs" : "does not differ" ) );
}
+
+ is.close();
+ is = null;
}
finally
{
@@ -936,6 +944,8 @@ public class ProcessRemoteResourcesMojo
try
{
outStream.writeTo( os );
+ os.close();
+ os = null;
}
finally
{
@@ -1141,8 +1151,6 @@ public class ProcessRemoteResourcesMojo
protected void processResourceBundles( RemoteResourcesClassLoader classLoader, VelocityContext context )
throws MojoExecutionException
{
- InputStreamReader reader = null;
-
try
{
// CHECKSTYLE_OFF: LineLength
@@ -1150,6 +1158,10 @@ public class ProcessRemoteResourcesMojo
{
URL url = e.nextElement();
+ InputStream in = null;
+ OutputStream out = null;
+ Reader reader = null;
+ Writer writer = null;
try
{
reader = new InputStreamReader( url.openStream() );
@@ -1158,6 +1170,9 @@ public class ProcessRemoteResourcesMojo
RemoteResourcesBundle bundle = bundleReader.read( reader );
+ reader.close();
+ reader = null;
+
for ( String bundleResource : bundle.getRemoteResources() )
{
String projectResource = bundleResource;
@@ -1180,38 +1195,27 @@ public class ProcessRemoteResourcesMojo
if ( doVelocity )
{
DeferredFileOutputStream os =
- new DeferredFileOutputStream( velocityFilterInMemoryThreshold, f );
- Writer writer;
+ new DeferredFileOutputStream( velocityFilterInMemoryThreshold, f );
+
+ writer = bundle.getSourceEncoding() == null
+ ? new OutputStreamWriter( os )
+ : new OutputStreamWriter( os, bundle.getSourceEncoding() );
+
if ( bundle.getSourceEncoding() == null )
{
- writer = new OutputStreamWriter( os );
+ // TODO: Is this correct? Shouldn't we behave like the rest of maven and fail
+ // down to JVM default instead ISO-8859-1 ?
+ velocity.mergeTemplate( bundleResource, "ISO-8859-1", context, writer );
}
else
{
- writer =
- new OutputStreamWriter( os,
- bundle.getSourceEncoding() );
- }
-
- try
- {
- if ( bundle.getSourceEncoding() == null )
- {
- // TODO: Is this correct? Shouldn't we behave like the rest of maven and fail
- // down to JVM default instead ISO-8859-1 ?
- velocity.mergeTemplate( bundleResource, "ISO-8859-1", context, writer );
- }
- else
- {
- velocity.mergeTemplate( bundleResource, bundle.getSourceEncoding(), context,
- writer );
+ velocity.mergeTemplate( bundleResource, bundle.getSourceEncoding(), context,
+ writer );
- }
- }
- finally
- {
- IOUtil.close( writer );
}
+
+ writer.close();
+ writer = null;
fileWriteIfDiffers( os );
}
else
@@ -1225,25 +1229,20 @@ public class ProcessRemoteResourcesMojo
File appendedResourceFile = new File( appendedResourcesDirectory, projectResource );
File appendedVmResourceFile =
new File( appendedResourcesDirectory, projectResource + ".vm" );
+
if ( appendedResourceFile.exists() )
{
- final InputStream in = new FileInputStream( appendedResourceFile );
- final OutputStream append = new FileOutputStream( f, true );
-
- try
- {
- IOUtil.copy( in, append );
- }
- finally
- {
- IOUtil.close( in );
- IOUtil.close( append );
- }
+ in = new FileInputStream( appendedResourceFile );
+ out = new FileOutputStream( f, true );
+ IOUtil.copy( in, out );
+ out.close();
+ out = null;
+ in.close();
+ in = null;
}
else if ( appendedVmResourceFile.exists() )
{
- PrintWriter writer;
- FileReader freader = new FileReader( appendedVmResourceFile );
+ reader = new FileReader( appendedVmResourceFile );
if ( bundle.getSourceEncoding() == null )
{
@@ -1256,24 +1255,22 @@ public class ProcessRemoteResourcesMojo
bundle.getSourceEncoding() ) );
}
- try
- {
- Velocity.init();
- Velocity.evaluate( context, writer, "remote-resources", freader );
- }
- finally
- {
- IOUtil.close( writer );
- IOUtil.close( freader );
- }
+ Velocity.init();
+ Velocity.evaluate( context, writer, "remote-resources", reader );
+ writer.close();
+ writer = null;
+ reader.close();
+ reader = null;
}
-
}
}
}
finally
{
- reader.close();
+ IOUtil.close( out );
+ IOUtil.close( in );
+ IOUtil.close( writer );
+ IOUtil.close( reader );
}
// CHECKSTYLE_ON: LineLength
}
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java Thu May 5 03:22:53 2016
@@ -239,7 +239,7 @@ public class RemoteResourcesMojoTest
InputStream in = new FileInputStream( file );
byte[] data = IOUtil.toByteArray( in );
- IOUtil.close( in );
+ in.close();
byte[] expected = "\u00E4\u00F6\u00FC\u00C4\u00D6\u00DC\u00DF".getBytes( "UTF-8" );
assertTrue( Arrays.equals( expected, data ) );
@@ -280,7 +280,7 @@ public class RemoteResourcesMojoTest
InputStream in = new FileInputStream( file );
byte[] data = IOUtil.toByteArray( in );
- IOUtil.close( in );
+ in.close();
byte[] expected = "\u00E4\u00F6\u00FC\u00C4\u00D6\u00DC\u00DF".getBytes( "ISO-8859-1" );
assertTrue( Arrays.equals( expected, data ) );
@@ -405,8 +405,8 @@ public class RemoteResourcesMojoTest
InputStream in = new FileInputStream(resource);
jar.putNextEntry(new ZipEntry(resourceName));
IOUtil.copy(in, jar);
- IOUtil.close(in);
jar.closeEntry();
+ in.close();
}
jar.close();
}
Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-repository-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -137,7 +137,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.shared</groupId>
Modified: maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java Thu May 5 03:22:53 2016
@@ -413,6 +413,8 @@ public class BundlePackMojo
{
reader = ReaderFactory.newXmlReader( pom );
model = new MavenXpp3Reader().read( reader );
+ reader.close();
+ reader = null;
}
catch ( XmlPullParserException e )
{
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/it/support/IntegrationTestUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/it/support/IntegrationTestUtils.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/it/support/IntegrationTestUtils.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/it/support/IntegrationTestUtils.java Thu May 5 03:22:53 2016
@@ -29,8 +29,8 @@ import org.codehaus.plexus.util.xml.pull
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.Reader;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@@ -142,24 +142,14 @@ public class IntegrationTestUtils
{
URL resource = Thread.currentThread().getContextClassLoader().getResource( "META-INF/maven/plugin.xml" );
- InputStream stream = null;
+ Reader reader = null;
try
{
- stream = resource.openStream();
+ reader = new InputStreamReader( resource.openStream() );
Xpp3Dom pluginDom;
- try
- {
- pluginDom = Xpp3DomBuilder.build( new InputStreamReader( stream ) );
- }
- catch ( XmlPullParserException e )
- {
- IOException err = new IOException(
- "Failed to parse plugin descriptor for groupId:artifactId:version prefix. Reason: "
- + e.getMessage() );
- err.initCause( e );
-
- throw err;
- }
+ pluginDom = Xpp3DomBuilder.build( reader );
+ reader.close();
+ reader = null;
pluginArtifactId = pluginDom.getChild( "artifactId" ).getValue();
pluginGroupId = pluginDom.getChild( "groupId" ).getValue();
@@ -167,9 +157,15 @@ public class IntegrationTestUtils
cliPluginPrefix = pluginGroupId + ":" + pluginArtifactId + ":" + pluginVersion + ":";
}
+ catch ( XmlPullParserException e )
+ {
+ throw (IOException) new IOException(
+ "Failed to parse plugin descriptor for groupId:artifactId:version prefix." ).initCause( e );
+
+ }
finally
{
- close( stream );
+ close( reader );
}
}
}
Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -116,7 +116,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-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java Thu May 5 03:22:53 2016
@@ -95,6 +95,8 @@ public abstract class AbstractPropertyUt
{
in = new FileInputStream( validationPropFile );
validationProp.load( in );
+ in.close();
+ in = null;
}
catch ( IOException ex )
{
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java Thu May 5 03:22:53 2016
@@ -24,7 +24,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
-import java.io.Reader;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -693,11 +692,13 @@ public class ResourcesMojoTest
{
assertTrue( FileUtils.fileExists( fileName ) );
- Reader reader = null;
+ BufferedReader reader = null;
try
{
- reader = new FileReader( fileName );
- assertEquals( data, new BufferedReader( reader ).readLine() );
+ reader = new BufferedReader( new FileReader( fileName ) );
+ assertEquals( data, reader.readLine() );
+ reader.close();
+ reader = null;
}
finally
{
Modified: maven/plugins/trunk/maven-scm-publish-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-scm-publish-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-scm-publish-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -145,7 +145,7 @@ under the License.
<dependency><!-- necessary for Maven 2 compatibility -->
<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-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java (original)
+++ maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java Thu May 5 03:22:53 2016
@@ -202,8 +202,8 @@ public class ScmPublishPublishScmMojo
{
in = new BufferedReader( new InputStreamReader( new FileInputStream( srcFile ), siteOutputEncoding ) );
out = new PrintWriter( new OutputStreamWriter( new FileOutputStream( destFile ), siteOutputEncoding ) );
- String line;
- while ( ( line = in.readLine() ) != null )
+
+ for ( String line = in.readLine(); line != null; line = in.readLine() )
{
if ( in.ready() )
{
@@ -214,6 +214,11 @@ public class ScmPublishPublishScmMojo
out.print( line );
}
}
+
+ out.close();
+ out = null;
+ in.close();
+ in = null;
}
finally
{
Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Thu May 5 03:22:53 2016
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.22</version>
+ <version>3.0.23</version>
</dependency>
<!-- Others -->
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java Thu May 5 03:22:53 2016
@@ -43,6 +43,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
@@ -89,19 +90,18 @@ public class DefaultShader
// noinspection ResultOfMethodCallIgnored
shadeRequest.getUberJar().getParentFile().mkdirs();
- FileOutputStream fileOutputStream = new FileOutputStream( shadeRequest.getUberJar() );
- JarOutputStream jos = new JarOutputStream( new BufferedOutputStream( fileOutputStream ) );
+ JarOutputStream out = null;
try
{
-
- goThroughAllJarEntriesForManifestTransformer( shadeRequest, resources, manifestTransformer, jos );
+ out = new JarOutputStream( new BufferedOutputStream( new FileOutputStream( shadeRequest.getUberJar() ) ) );
+ goThroughAllJarEntriesForManifestTransformer( shadeRequest, resources, manifestTransformer, out );
// CHECKSTYLE_OFF: MagicNumber
Multimap<String, File> duplicates = HashMultimap.create( 10000, 3 );
// CHECKSTYLE_ON: MagicNumber
- shadeJars( shadeRequest, resources, transformers, remapper, jos, duplicates );
+ shadeJars( shadeRequest, resources, transformers, remapper, out, duplicates );
// CHECKSTYLE_OFF: MagicNumber
Multimap<Collection<File>, String> overlapping = HashMultimap.create( 20, 15 );
@@ -128,14 +128,16 @@ public class DefaultShader
{
if ( transformer.hasTransformedResource() )
{
- transformer.modifyOutputStream( jos );
+ transformer.modifyOutputStream( out );
}
}
+ out.close();
+ out = null;
}
finally
{
- IOUtil.close( jos );
+ IOUtil.close( out );
}
for ( Filter filter : shadeRequest.getFilters() )
@@ -195,11 +197,10 @@ public class DefaultShader
JarEntry entry, String name )
throws IOException, MojoExecutionException
{
- InputStream is = jarFile.getInputStream( entry );
-
+ InputStream in =null;
try
{
-
+ in = jarFile.getInputStream( entry );
String mappedName = remapper.map( name );
int idx = mappedName.lastIndexOf( '/' );
@@ -216,7 +217,7 @@ public class DefaultShader
if ( name.endsWith( ".class" ) )
{
duplicates.put( name, jar );
- addRemappedClass( remapper, jos, jar, name, is );
+ addRemappedClass( remapper, jos, jar, name, in );
}
else if ( shadeRequest.isShadeSourcesContent() && name.endsWith( ".java" ) )
{
@@ -226,11 +227,11 @@ public class DefaultShader
return;
}
- addJavaSource( resources, jos, mappedName, is, shadeRequest.getRelocators() );
+ addJavaSource( resources, jos, mappedName, in, shadeRequest.getRelocators() );
}
else
{
- if ( !resourceTransformed( transformers, mappedName, is, shadeRequest.getRelocators() ) )
+ if ( !resourceTransformed( transformers, mappedName, in, shadeRequest.getRelocators() ) )
{
// Avoid duplicates that aren't accounted for by the resource transformers
if ( resources.contains( mappedName ) )
@@ -238,14 +239,16 @@ public class DefaultShader
return;
}
- addResource( resources, jos, mappedName, is );
+ addResource( resources, jos, mappedName, in );
}
}
+ in.close();
+ in = null;
}
finally
{
- IOUtil.close( is );
+ IOUtil.close( in );
}
}
@@ -516,7 +519,7 @@ public class DefaultShader
sourceContent = relocator.applyToSourceContent( sourceContent );
}
- OutputStreamWriter writer = new OutputStreamWriter( jos, "UTF-8" );
+ final Writer writer = new OutputStreamWriter( jos, "UTF-8" );
IOUtil.copy( sourceContent, writer );
writer.flush();
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java Thu May 5 03:22:53 2016
@@ -116,6 +116,8 @@ public class MinijarFilter
{
is = new FileInputStream( dependency.getFile() );
clazzpathUnit = cp.addClazzpathUnit( is, dependency.toString() );
+ is.close();
+ is = null;
}
catch ( ZipException e )
{
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Thu May 5 03:22:53 2016
@@ -23,6 +23,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Arrays;
@@ -682,16 +684,22 @@ public class ShadeMojo
private void copyFiles( File source, File target )
throws IOException
{
- FileOutputStream fout = new FileOutputStream( target );
- FileInputStream fin = new FileInputStream( source );
+ InputStream in = null;
+ OutputStream out = null;
try
{
- IOUtil.copy( fin, fout );
+ in = new FileInputStream( source );
+ out = new FileOutputStream( target );
+ IOUtil.copy( in, out );
+ out.close();
+ out = null;
+ in.close();
+ in = null;
}
finally
{
- IOUtil.close( fin );
- IOUtil.close( fout );
+ IOUtil.close( in );
+ IOUtil.close( out );
}
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java?rev=1742353&r1=1742352&r2=1742353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java Thu May 5 03:22:53 2016
@@ -166,6 +166,9 @@ public class ComponentsXmlResourceTransf
}
Xpp3DomWriter.write( writer, dom );
+
+ writer.close();
+ writer = null;
}
finally
{