[MNG-7715] Update to resolver 1.9.6 (#1025)

Update and apply some adjustments to UTs as error message did change. --- https://issues.apache.org/jira/browse/MNG-7715
apache · Mar 9, 2023 · 2370909 · 2370909
1 parent 86d5eab
commit 2370909
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -19,8 +19,9 @@
  * under the License.
  */
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.util.Collections;
@@ -69,7 +70,7 @@ public void testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() thro
         catch ( final UnresolvableModelException e )
         {
             assertNotNull( e.getMessage() );
-            assertThat( e.getMessage(), startsWith( "Could not find artifact org.apache:apache:pom:0 in central" ) );
+            assertThat( e.getMessage(), containsString( "Could not find artifact org.apache:apache:pom:0 in central" ) );
         }
     }
 
@@ -150,7 +151,7 @@ public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNotFound()
         catch ( final UnresolvableModelException e )
         {
             assertNotNull( e.getMessage() );
-            assertThat( e.getMessage(), startsWith( "Could not find artifact org.apache:apache:pom:0 in central" ) );
+            assertThat( e.getMessage(), containsString( "Could not find artifact org.apache:apache:pom:0 in central" ) );
         }
     }
 

diff --git a/...provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java b/...provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
@@ -63,7 +63,7 @@ public void testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() thro
         catch ( final UnresolvableModelException e )
         {
             assertNotNull( e.getMessage() );
-            assertTrue( e.getMessage().startsWith( "Could not find artifact ut.simple:artifact:pom:0 in repo" ) );
+            assertTrue( e.getMessage().contains( "Could not find artifact ut.simple:artifact:pom:0 in repo" ) );
         }
     }
 
@@ -144,7 +144,7 @@ public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNotFound()
         catch ( final UnresolvableModelException e )
         {
             assertNotNull( e.getMessage() );
-            assertTrue( e.getMessage().startsWith( "Could not find artifact ut.simple:artifact:pom:0 in repo" ) );
+            assertTrue( e.getMessage().contains( "Could not find artifact ut.simple:artifact:pom:0 in repo" ) );
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,7 @@ under the License.
     <cipherVersion>2.0</cipherVersion>
     <modelloVersion>1.11</modelloVersion>
     <jxpathVersion>1.3</jxpathVersion>
-    <resolverVersion>1.9.2</resolverVersion>
+    <resolverVersion>1.9.6</resolverVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <xmlunitVersion>2.2.1</xmlunitVersion>
     <powermockVersion>1.7.4</powermockVersion>