Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require Maven 3.2.5 #643

Merged
merged 1 commit into from
Aug 20, 2022
Merged

Require Maven 3.2.5 #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
</contributors>

<prerequisites>
<maven>3.0</maven>
<maven>${mavenVersion}</maven>
</prerequisites>

<scm>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
}
}
Expand Down
5 changes: 2 additions & 3 deletions src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -58,7 +57,7 @@
/**
* Test {@link DefaultVersionsHelper}
*/
public class DefaultVersionsHelperTest extends PlexusTestCase
public class DefaultVersionsHelperTest extends AbstractMojoTestCase
{

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/codehaus/mojo/versions/ordering/VersionComparatorsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
};
Expand Down