Author: krosenvold Date: Thu Nov 19 06:58:11 2015 New Revision: 1715111 URL: http://svn.apache.org/viewvc?rev=1715111&view=rev Log: Close streams even in test cases
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java?rev=1715111&r1=1715110&r2=1715111&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java Thu Nov 19 06:58:11 2015 @@ -38,7 +38,9 @@ import org.apache.maven.model.Model; import org.apache.maven.model.PluginManagement; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.plugin.testing.stubs.MavenProjectStub; +import org.apache.maven.shared.utils.io.IOUtil; import org.codehaus.plexus.util.ReaderFactory; +import org.codehaus.plexus.util.xml.XmlStreamReader; /** * @author Edwin Punzalan @@ -59,15 +61,21 @@ public abstract class ProjectInfoProject public ProjectInfoProjectStub() { MavenXpp3Reader pomReader = new MavenXpp3Reader(); + XmlStreamReader reader = null; try { - model = pomReader.read( ReaderFactory.newXmlReader( new File( getBasedir(), getPOM() ) ) ); + reader = ReaderFactory.newXmlReader( new File( getBasedir(), getPOM() ) ); + model = pomReader.read( reader ); setModel( model ); } catch ( Exception e ) { throw new RuntimeException( e ); } + finally + { + IOUtil.close( reader ); + } setGroupId( model.getGroupId() ); setArtifactId( model.getArtifactId() ); @@ -76,8 +84,7 @@ public abstract class ProjectInfoProject setUrl( model.getUrl() ); setPackaging( model.getPackaging() ); - Artifact artifact = new ProjectInfoPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), - getPackaging() ); + Artifact artifact = new ProjectInfoPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging() ); artifact.setArtifactHandler( new DefaultArtifactHandlerStub() ); setArtifact( artifact ); @@ -85,11 +92,9 @@ public abstract class ProjectInfoProject build.setFinalName( model.getArtifactId() ); build.setDirectory( super.getBasedir() + "/target/test/unit/" + model.getArtifactId() + "/target" ); build.setSourceDirectory( getBasedir() + "/src/main/java" ); - build.setOutputDirectory( super.getBasedir() + "/target/test/unit/" + model.getArtifactId() - + "/target/classes" ); + build.setOutputDirectory( super.getBasedir() + "/target/test/unit/" + model.getArtifactId() + "/target/classes" ); build.setTestSourceDirectory( getBasedir() + "/src/test/java" ); - build.setTestOutputDirectory( super.getBasedir() + "/target/test/unit/" + model.getArtifactId() - + "/target/test-classes" ); + build.setTestOutputDirectory( super.getBasedir() + "/target/test/unit/" + model.getArtifactId() + "/target/test-classes" ); setBuild( build ); List<String> compileSourceRoots = new ArrayList<String>();