You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/07/06 11:13:07 UTC
[maven-dependency-plugin] 01/01: properly handle encoding and close
streams
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch leak
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit c59d6ee0652989db13ea37282f34d42eea9c54fc
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Mon Jul 6 07:12:51 2020 -0400
properly handle encoding and close streams
---
.../stubs/DuplicateDependencies2ProjectStub.java | 26 ++++++++++++----------
.../stubs/DuplicateDependenciesProjectStub.java | 26 ++++++++++++----------
2 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java b/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java
index 0c33b6e..60cc77c 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java
@@ -20,11 +20,13 @@ package org.apache.maven.plugins.dependency.testUtils.stubs;
*/
import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.IOException;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* very simple stub of maven project, going to take a lot of work to make it useful as a stub though
@@ -36,25 +38,25 @@ public class DuplicateDependencies2ProjectStub
{
File pom = new File( getBasedir(), "plugin-config2.xml" );
MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model;
- try
+ try ( FileInputStream in = new FileInputStream( pom ) )
{
- model = pomReader.read( new FileReader( pom ) );
+ Model model = pomReader.read( in );
setModel( model );
+
+ setGroupId( model.getGroupId() );
+ setArtifactId( model.getArtifactId() );
+ setVersion( model.getVersion() );
+ setName( model.getName() );
+ setUrl( model.getUrl() );
+ setPackaging( model.getPackaging() );
+ setFile( pom );
}
- catch ( Exception e )
+ catch ( IOException | XmlPullParserException e )
{
throw new RuntimeException( e );
}
- setGroupId( model.getGroupId() );
- setArtifactId( model.getArtifactId() );
- setVersion( model.getVersion() );
- setName( model.getName() );
- setUrl( model.getUrl() );
- setPackaging( model.getPackaging() );
- setFile( pom );
}
/**
diff --git a/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java b/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java
index 87340dd..e26c30e 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java
@@ -20,11 +20,13 @@ package org.apache.maven.plugins.dependency.testUtils.stubs;
*/
import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.IOException;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* very simple stub of maven project, going to take a lot of work to make it useful as a stub though
@@ -36,25 +38,25 @@ public class DuplicateDependenciesProjectStub
{
File pom = new File( getBasedir(), "plugin-config.xml" );
MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model;
- try
+ try ( FileInputStream in = new FileInputStream( pom ) )
{
- model = pomReader.read( new FileReader( pom ) );
+ Model model = pomReader.read( in );
setModel( model );
+
+ setGroupId( model.getGroupId() );
+ setArtifactId( model.getArtifactId() );
+ setVersion( model.getVersion() );
+ setName( model.getName() );
+ setUrl( model.getUrl() );
+ setPackaging( model.getPackaging() );
+ setFile( pom );
}
- catch ( Exception e )
+ catch ( IOException | XmlPullParserException e )
{
throw new RuntimeException( e );
}
- setGroupId( model.getGroupId() );
- setArtifactId( model.getArtifactId() );
- setVersion( model.getVersion() );
- setName( model.getName() );
- setUrl( model.getUrl() );
- setPackaging( model.getPackaging() );
- setFile( pom );
}
/**