You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/03/19 22:24:17 UTC
svn commit: r1083294 -
/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Author: hboutemy
Date: Sat Mar 19 21:24:16 2011
New Revision: 1083294
URL: http://svn.apache.org/viewvc?rev=1083294&view=rev
Log:
closed InputStream
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
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=1083294&r1=1083293&r2=1083294&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 Sat Mar 19 21:24:16 2011
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.site;
*/
import java.io.File;
+import java.io.InputStream;
import java.util.List;
import java.util.Properties;
@@ -30,6 +31,7 @@ import org.apache.maven.plugin.AbstractM
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.i18n.I18N;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
/**
@@ -142,8 +144,16 @@ public abstract class AbstractSiteMojo
// and that should have a pom.properties file
// if this ever changes, we will have to revisit this code.
final Properties properties = new Properties();
- properties.load( MavenProject.class.getClassLoader().getResourceAsStream(
- "META-INF/maven/org.apache.maven/maven-core/pom.properties" ) );
+ final InputStream in =
+ MavenProject.class.getResourceAsStream( "META-INF/maven/org.apache.maven/maven-core/pom.properties" );
+ try
+ {
+ properties.load( in );
+ }
+ finally
+ {
+ IOUtil.close( in );
+ }
final String version = properties.getProperty( "version" ).trim();
@@ -157,5 +167,4 @@ public abstract class AbstractSiteMojo
getLog().debug( "Unable to determine Maven version", e );
}
}
-
}