This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch maven-3.8.x-resolver-1.9.x in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2370909b939ea7a84dd085b0e027f741784f1c01 Author: Tamas Cservenak <[email protected]> AuthorDate: Mon Mar 6 10:42:55 2023 +0100 [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 --- .../java/org/apache/maven/project/ProjectModelResolverTest.java | 7 ++++--- .../apache/maven/repository/internal/DefaultModelResolverTest.java | 4 ++-- pom.xml | 2 +- 3 files changed, 7 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 fb1c64238..035aaacd2 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 @@ -19,8 +19,9 @@ package org.apache.maven.project; * 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 class ProjectModelResolverTest extends AbstractMavenProjectTestCase 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 class ProjectModelResolverTest extends AbstractMavenProjectTestCase 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/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 e895bbb09..45bb65f11 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 @@ -63,7 +63,7 @@ public final class DefaultModelResolverTest extends AbstractRepositoryTestCase 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 final class DefaultModelResolverTest extends AbstractRepositoryTestCase 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 index 1ab6163da..00482cba7 100644 --- 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>
