40
40
import org .apache .maven .shared .release .config .ReleaseUtils ;
41
41
import org .apache .maven .shared .release .env .DefaultReleaseEnvironment ;
42
42
import org .apache .maven .shared .release .util .ReleaseUtil ;
43
- import org .codehaus .plexus .util .IOUtil ;
44
43
import org .junit .Test ;
45
44
46
45
import static org .junit .Assert .assertEquals ;
@@ -162,14 +161,9 @@ public void testExecuteWithSuppressCommitBeforeTag() throws Exception {
162
161
ReleaseResult result = phase .execute (
163
162
ReleaseUtils .buildReleaseDescriptor (builder ), new DefaultReleaseEnvironment (), reactorProjects );
164
163
165
- BufferedReader reader = null ;
166
- try {
167
- reader = new BufferedReader (new StringReader (result .getOutput ()));
168
-
164
+ try (BufferedReader reader = new BufferedReader (new StringReader (result .getOutput ()))) {
169
165
assertEquals ("[INFO] Removing release POM for 'artifactId'..." , reader .readLine ());
170
166
assertEquals ("Expected EOF" , null , reader .readLine ());
171
- } finally {
172
- IOUtil .close (reader );
173
167
}
174
168
175
169
// never invoke scmProviderMock
@@ -193,18 +187,13 @@ public void testSimulateWithSuppressCommitBeforeTag() throws Exception {
193
187
ReleaseResult result = phase .simulate (
194
188
ReleaseUtils .buildReleaseDescriptor (builder ), new DefaultReleaseEnvironment (), reactorProjects );
195
189
196
- BufferedReader reader = null ;
197
- try {
198
- reader = new BufferedReader (new StringReader (result .getOutput ()));
199
-
190
+ try (BufferedReader reader = new BufferedReader (new StringReader (result .getOutput ()))) {
200
191
assertEquals ("[INFO] Removing release POM for 'artifactId'..." , reader .readLine ());
201
192
assertEquals (
202
193
"[INFO] Full run would be removing ["
203
194
+ reactorProjects .get (0 ).getFile ().getParent () + File .separator + "release-pom.xml]" ,
204
195
reader .readLine ());
205
196
assertEquals ("Expected EOF" , null , reader .readLine ());
206
- } finally {
207
- IOUtil .close (reader );
208
197
}
209
198
210
199
// never invoke scmProviderMock
0 commit comments