Merge branch 'apache:master' into submodule-update

apache · Jan 10, 2025 · 1415d0c · 1415d0c
2 parents 8eb121b + 1487251
commit 1415d0c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ChangeLogMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ChangeLogMojoTest.java
@@ -103,7 +103,7 @@ public void testChangeLogWithBadUserDateFormat() throws Exception {
 
             fail("mojo execution must fail.");
         } catch (MojoExecutionException e) {
-            assertTrue(true);
+            assertNotNull(e.getMessage());
         }
     }
 
@@ -126,7 +126,7 @@ public void testChangeLogWithBadConnectionUrl() throws Exception {
 
             fail("mojo execution must fail.");
         } catch (MojoExecutionException e) {
-            assertTrue(true);
+            assertNotNull(e.getMessage());
         }
     }
 }
diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java
@@ -107,7 +107,7 @@ public void testSkipCheckoutWithoutConnectionUrl() throws Exception {
 
             fail("mojo execution must fail.");
         } catch (MojoExecutionException e) {
-            assertTrue(true);
+            assertNotNull(e.getMessage());
         }
     }
 

diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java
@@ -102,7 +102,7 @@ public void testUntag() throws Exception {
 
             fail("mojo execution must fail.");
         } catch (MojoExecutionException e) {
-            assertTrue(true);
+            assertNotNull(e.getMessage());
         }
     }
 

diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ValidateMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ValidateMojoTest.java
@@ -52,7 +52,7 @@ public void testValidateWithInvalidScmUrls() throws Exception {
 
             fail("mojo execution must fail.");
         } catch (MojoExecutionException e) {
-            assertTrue(true);
+            assertNotNull(e.getMessage());
         }
     }
 }
diff --git a/...s/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java b/...s/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
@@ -119,8 +119,7 @@ private HgUrlParserResult parseScmUrl(String scmSpecificUrl) {
             }
         } else {
             try {
-                @SuppressWarnings("unused")
-                File file = new File(scmSpecificUrl);
+                new File(scmSpecificUrl);
             } catch (Throwable e) {
                 result.messages.add("The filename provided is not valid");