Skip to content

Commit 0da97a2

Browse files
authored
use more modern I/O that does not rely on the system encoding (#174)
1 parent 422ccc4 commit 0da97a2

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020

2121
import java.io.File;
2222
import java.io.IOException;
23+
import java.io.InputStream;
24+
import java.nio.file.Files;
2325
import java.util.ArrayList;
2426
import java.util.List;
2527

2628
import org.apache.maven.model.Model;
2729
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
2830
import org.apache.maven.project.MavenProject;
2931
import org.apache.maven.shared.release.PlexusJUnit4TestCase;
30-
import org.codehaus.plexus.util.ReaderFactory;
31-
import org.codehaus.plexus.util.xml.XmlStreamReader;
3232
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
3333

3434
/**
@@ -72,12 +72,11 @@ protected List<MavenProject> getReactorProjects(String projectPath) throws Excep
7272

7373
private MavenProject createMavenProject(File pomFile) throws IOException, XmlPullParserException {
7474
MavenXpp3Reader reader = new MavenXpp3Reader();
75-
Model model;
76-
try (XmlStreamReader xmlStreamReader = ReaderFactory.newXmlReader(pomFile)) {
77-
model = reader.read(xmlStreamReader);
75+
try (InputStream in = Files.newInputStream(pomFile.toPath())) {
76+
Model model = reader.read(in);
77+
MavenProject project = new MavenProject(model);
78+
project.setFile(pomFile);
79+
return project;
7880
}
79-
MavenProject project = new MavenProject(model);
80-
project.setFile(pomFile);
81-
return project;
8281
}
8382
}

0 commit comments

Comments
 (0)