Merge pull request #1407 from michalvavrik/feature/fix-win-cli

Fix most of QuarkusCliCreateJvmApplicationIT file handling (but not all) on Windows
quarkus-qe · Sep 12, 2023 · a74b708 · a74b708
2 parents eded622 + 661014f
commit a74b708
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateJvmApplicationIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateJvmApplicationIT.java
@@ -320,8 +320,8 @@ private void assertInstalledExtensions(QuarkusCliRestService app, String... expe
 
     private void assertExpectedJavaVersion(File pomFile, String expectedJavaVersion) {
         MavenXpp3Reader reader = new MavenXpp3Reader();
-        try {
-            Model model = reader.read(new FileReader(pomFile));
+        try (FileReader fileReader = new FileReader(pomFile)) {
+            Model model = reader.read(fileReader);
             Assertions.assertEquals(model.getProperties().get("maven.compiler.release"), expectedJavaVersion,
                     "Unexpected Java version defined in maven.compiler.release property of pom.xml. " +
                             "Java support tool should detect host Java version or use " +
@@ -332,8 +332,7 @@ private void assertExpectedJavaVersion(File pomFile, String expectedJavaVersion)
     }
 
     private void assertDockerJavaVersion(File dockerFile, String expectedVersion) {
-        try {
-            Scanner sc = new Scanner(dockerFile);
+        try (Scanner sc = new Scanner(dockerFile)) {
             String line = "";
             while (sc.hasNextLine()) {
                 line = sc.nextLine();