Require Maven 3.2.5

mojohaus · Aug 20, 2022 · fbe667f · fbe667f
1 parent b6c13cc
commit fbe667f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,7 @@
   </contributors>
 
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>${mavenVersion}</maven>
   </prerequisites>
 
   <scm>
@@ -98,7 +98,7 @@
     <mojo.java.target>1.8</mojo.java.target>
     <maven.compiler.source>${mojo.java.target}</maven.compiler.source>
     <junitBomVersion>5.9.0</junitBomVersion>
-    <mavenVersion>3.0.5</mavenVersion>
+    <mavenVersion>3.2.5</mavenVersion>
     <wagonVersion>3.5.2</wagonVersion>
     <doxiaVersion>1.11.1</doxiaVersion>
     <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
@@ -228,6 +228,13 @@
       <artifactId>commons-lang3</artifactId>
       <version>3.12.0</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven.plugin-testing</groupId>
+      <artifactId>maven-plugin-testing-harness</artifactId>
+      <version>3.3.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>

diff --git a/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java b/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java
@@ -36,16 +36,15 @@
 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;
 import org.apache.maven.model.Profile;
 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
@@ -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
@@ -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",
     };