[maven-release] branch master updated: use more modern I/O that does not rely on the system encoding (#174)

[elharo]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
     new 0da97a26 use more modern I/O that does not rely on the system encoding 
(#174)
0da97a26 is described below

commit 0da97a2639d6ef72481a486376661607baa91ffe
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Thu Mar 16 10:41:16 2023 -0400

    use more modern I/O that does not rely on the system encoding (#174)
---
 .../shared/release/phase/AbstractBackupPomsPhaseTest.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
 
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
index ad0e863d..43648bb4 100644
--- 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
+++ 
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
@@ -20,6 +20,8 @@ package org.apache.maven.shared.release.phase;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,8 +29,6 @@ import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.release.PlexusJUnit4TestCase;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 /**
@@ -72,12 +72,11 @@ public abstract class AbstractBackupPomsPhaseTest extends 
PlexusJUnit4TestCase {
 
     private MavenProject createMavenProject(File pomFile) throws IOException, 
XmlPullParserException {
         MavenXpp3Reader reader = new MavenXpp3Reader();
-        Model model;
-        try (XmlStreamReader xmlStreamReader = 
ReaderFactory.newXmlReader(pomFile)) {
-            model = reader.read(xmlStreamReader);
+        try (InputStream in = Files.newInputStream(pomFile.toPath())) {
+            Model model = reader.read(in);
+            MavenProject project = new MavenProject(model);
+            project.setFile(pomFile);
+            return project;
         }
-        MavenProject project = new MavenProject(model);
-        project.setFile(pomFile);
-        return project;
     }
 }