[maven-release] branch master updated: Prefer more modern try with resources over IOUtil.close (#179)

[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 d60bbc34 Prefer more modern try with resources over IOUtil.close (#179)
d60bbc34 is described below

commit d60bbc34d0ced1f5005c32f3b9e1d03d0b9582c9
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Thu Mar 16 08:35:05 2023 -0400

    Prefer more modern try with resources over IOUtil.close (#179)
---
 .../shared/release/phase/RemoveReleasePomsPhaseTest.java  | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
 
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
index 39934f58..d51cbe83 100644
--- 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
+++ 
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
@@ -40,7 +40,6 @@ import 
org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
 import org.apache.maven.shared.release.config.ReleaseUtils;
 import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
 import org.apache.maven.shared.release.util.ReleaseUtil;
-import org.codehaus.plexus.util.IOUtil;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -162,14 +161,9 @@ public class RemoveReleasePomsPhaseTest extends 
AbstractReleaseTestCase {
         ReleaseResult result = phase.execute(
                 ReleaseUtils.buildReleaseDescriptor(builder), new 
DefaultReleaseEnvironment(), reactorProjects);
 
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new StringReader(result.getOutput()));
-
+        try (BufferedReader reader = new BufferedReader(new 
StringReader(result.getOutput()))) {
             assertEquals("[INFO] Removing release POM for 'artifactId'...", 
reader.readLine());
             assertEquals("Expected EOF", null, reader.readLine());
-        } finally {
-            IOUtil.close(reader);
         }
 
         // never invoke scmProviderMock
@@ -193,18 +187,13 @@ public class RemoveReleasePomsPhaseTest extends 
AbstractReleaseTestCase {
         ReleaseResult result = phase.simulate(
                 ReleaseUtils.buildReleaseDescriptor(builder), new 
DefaultReleaseEnvironment(), reactorProjects);
 
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new StringReader(result.getOutput()));
-
+        try (BufferedReader reader = new BufferedReader(new 
StringReader(result.getOutput()))) {
             assertEquals("[INFO] Removing release POM for 'artifactId'...", 
reader.readLine());
             assertEquals(
                     "[INFO] Full run would be removing ["
                             + reactorProjects.get(0).getFile().getParent() + 
File.separator + "release-pom.xml]",
                     reader.readLine());
             assertEquals("Expected EOF", null, reader.readLine());
-        } finally {
-            IOUtil.close(reader);
         }
 
         // never invoke scmProviderMock