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 2023/03/16 12:03:14 UTC
[maven-release] branch ioutil created (now cc80f1d3)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch ioutil
in repository https://gitbox.apache.org/repos/asf/maven-release.git
at cc80f1d3 Prefer more modern try with resources over IOUtil.close
This branch includes the following new commits:
new cc80f1d3 Prefer more modern try with resources over IOUtil.close
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-release] 01/01: Prefer more modern try with resources over IOUtil.close
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch ioutil
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit cc80f1d3c4afe22e8be1210f3145ebe3910f3977
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Thu Mar 16 08:03:02 2023 -0400
Prefer more modern try with resources over IOUtil.close
---
.../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