[maven] branch master updated: [MNG-7715] Update to resolver 1.9.6 (#1036)

[cstamas]

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new c1dfb947b [MNG-7715] Update to resolver 1.9.6 (#1036)
c1dfb947b is described below

commit c1dfb947b509e195c75d4275a113598cf3063c3e
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Mon Mar 6 11:17:56 2023 +0100

    [MNG-7715] Update to resolver 1.9.6 (#1036)
    
    Adjust some UTs as error message did change.
    
    ---
    
    https://issues.apache.org/jira/browse/MNG-7715
---
 .../java/org/apache/maven/project/ProjectModelResolverTest.java     | 6 +++---
 .../apache/maven/repository/internal/DefaultModelResolverTest.java  | 4 ++--
 pom.xml                                                             | 2 +-
 3 files changed, 6 insertions(+), 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
index b658f5eeb..2fa07153f 100644
--- 
a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.startsWith;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -69,7 +69,7 @@ public class ProjectModelResolverTest extends 
AbstractMavenProjectTestCase {
                 () -> newModelResolver().resolveModel(parent.getDelegate(), 
new AtomicReference<>()),
                 "Expected 'UnresolvableModelException' not thrown.");
         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"));
     }
 
     @Test
@@ -135,7 +135,7 @@ public class ProjectModelResolverTest extends 
AbstractMavenProjectTestCase {
                 () -> 
newModelResolver().resolveModel(dependency.getDelegate(), new 
AtomicReference<>()),
                 "Expected 'UnresolvableModelException' not thrown.");
         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"));
     }
 
     @Test
diff --git 
a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
 
b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
index 756604692..c96b4479b 100644
--- 
a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
+++ 
b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
@@ -65,7 +65,7 @@ public final class DefaultModelResolverTest extends 
AbstractRepositoryTestCase {
                 () -> newModelResolver().resolveModel(parent, new 
AtomicReference<>()),
                 "Expected 'UnresolvableModelException' not thrown.");
         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"));
     }
 
     @Test
@@ -138,7 +138,7 @@ public final class DefaultModelResolverTest extends 
AbstractRepositoryTestCase {
                 () -> newModelResolver().resolveModel(dependency, new 
AtomicReference<>()),
                 "Expected 'UnresolvableModelException' not thrown.");
         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"));
     }
 
     @Test
diff --git a/pom.xml b/pom.xml
index caa37fd67..f579ae42d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,7 +166,7 @@ under the License.
     <securityDispatcherVersion>2.0</securityDispatcherVersion>
     <cipherVersion>2.0</cipherVersion>
     <jxpathVersion>1.3</jxpathVersion>
-    <resolverVersion>1.9.5</resolverVersion>
+    <resolverVersion>1.9.6</resolverVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <xmlunitVersion>2.6.4</xmlunitVersion>
     
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>