diff --git a/pom.xml b/pom.xml index 72d20776e..486b4eb6b 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ - 3.0 + ${mavenVersion} @@ -98,7 +98,7 @@ 1.8 ${mojo.java.target} 5.9.0 - 3.0.5 + 3.2.5 3.5.2 1.11.1 1.11.1 @@ -228,6 +228,13 @@ commons-lang3 3.12.0 + + + org.apache.maven.plugin-testing + maven-plugin-testing-harness + 3.3.0 + test + org.junit.jupiter junit-jupiter diff --git a/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java b/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java index ef57ca301..91229b2f4 100644 --- a/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java @@ -36,7 +36,6 @@ import org.apache.maven.lifecycle.LifecycleExecutor; import org.apache.maven.lifecycle.mapping.LifecycleMapping; import org.apache.maven.model.Dependency; -import org.apache.maven.model.InputLocation; import org.apache.maven.model.Model; import org.apache.maven.model.Plugin; import org.apache.maven.model.Prerequisites; @@ -44,8 +43,8 @@ import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.building.DefaultModelBuildingRequest; import org.apache.maven.model.building.ModelBuildingRequest; -import org.apache.maven.model.building.ModelProblem.Severity; import org.apache.maven.model.building.ModelProblemCollector; +import org.apache.maven.model.building.ModelProblemCollectorRequest; import org.apache.maven.model.interpolation.ModelInterpolator; import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.apache.maven.plugin.InvalidPluginException; @@ -1799,8 +1798,10 @@ private static int compare( ArtifactVersion a, ArtifactVersion b ) } private static class IgnoringModelProblemCollector implements ModelProblemCollector { + @Override - public void add(Severity severity, String message, InputLocation location, Exception cause) { + public void add( ModelProblemCollectorRequest req ) + { // ignore } } diff --git a/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java b/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java index dd753bfde..44d9a2301 100644 --- a/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java +++ b/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java @@ -30,15 +30,14 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.plugin.MojoExecution; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.MavenMetadataSource; -import org.apache.maven.project.path.DefaultPathTranslator; import org.apache.maven.repository.RepositorySystem; import org.apache.maven.settings.Settings; import org.apache.maven.execution.MavenSession; import org.codehaus.mojo.versions.Property; import org.codehaus.mojo.versions.ordering.VersionComparators; -import org.codehaus.plexus.PlexusTestCase; import org.hamcrest.CoreMatchers; import org.junit.Test; @@ -58,7 +57,7 @@ /** * Test {@link DefaultVersionsHelper} */ -public class DefaultVersionsHelperTest extends PlexusTestCase +public class DefaultVersionsHelperTest extends AbstractMojoTestCase { @Test diff --git a/src/test/java/org/codehaus/mojo/versions/ordering/VersionComparatorsTest.java b/src/test/java/org/codehaus/mojo/versions/ordering/VersionComparatorsTest.java index be51e5bfc..07b244d07 100644 --- a/src/test/java/org/codehaus/mojo/versions/ordering/VersionComparatorsTest.java +++ b/src/test/java/org/codehaus/mojo/versions/ordering/VersionComparatorsTest.java @@ -32,7 +32,7 @@ public class VersionComparatorsTest "1.0", "1.0.0", "1.0.0-1", - "1.0.0.sp1", + "1.0.0-sp1", "foobar", "1-alpha-1", };