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

#538 switch to non-deprecated ModelInterpolator #549

Merged
merged 1 commit into from
Feb 17, 2022
Merged

#538 switch to non-deprecated ModelInterpolator #549

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
75 changes: 37 additions & 38 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,11 +36,17 @@
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.mapping.LifecycleMapping;
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.interpolation.ModelInterpolator;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.plugin.InvalidPluginException;
import org.apache.maven.plugin.MojoExecutionException;
Expand All @@ -56,8 +62,6 @@
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.interpolation.ModelInterpolationException;
import org.apache.maven.project.interpolation.ModelInterpolator;
import org.apache.maven.settings.Settings;
import org.codehaus.mojo.versions.api.ArtifactVersions;
import org.codehaus.mojo.versions.api.PomHelper;
Expand Down Expand Up @@ -716,35 +720,29 @@ private Map<String, String> getParentsPlugins( List<MavenProject> parents )
StringWriter writer = new StringWriter();
boolean havePom = false;
Model interpolatedModel;

Model originalModel = parentProject.getOriginalModel();
if ( originalModel == null )
{
getLog().warn( "project.getOriginalModel()==null for " + parentProject.getGroupId() + ":"
+ parentProject.getArtifactId() + ":" + parentProject.getVersion()
+ " is null, substituting project.getModel()" );
originalModel = parentProject.getModel();
}
try
{
Model originalModel = parentProject.getOriginalModel();
if ( originalModel == null )
{
getLog().warn( "project.getOriginalModel()==null for " + parentProject.getGroupId() + ":"
+ parentProject.getArtifactId() + ":" + parentProject.getVersion()
+ " is null, substituting project.getModel()" );
originalModel = parentProject.getModel();
}
try
{
new MavenXpp3Writer().write( writer, originalModel );
writer.close();
havePom = true;
}
catch ( IOException e )
{
// ignore
}
interpolatedModel =
modelInterpolator.interpolate( originalModel, null,
new DefaultProjectBuilderConfiguration().setExecutionProperties( getProject().getProperties() ),
false );
new MavenXpp3Writer().write( writer, originalModel );
writer.close();
havePom = true;
}
catch ( ModelInterpolationException e )
catch ( IOException e )
{
throw new MojoExecutionException( e.getMessage(), e );
// ignore
}
ModelBuildingRequest modelBuildingRequest = new DefaultModelBuildingRequest();
modelBuildingRequest.setUserProperties(getProject().getProperties());
interpolatedModel = modelInterpolator.interpolateModel( originalModel, null,
modelBuildingRequest, new IgnoringModelProblemCollector() );
if ( havePom )
{
try
Expand Down Expand Up @@ -1477,18 +1475,11 @@ private Set<Plugin> getProjectPlugins( Map<String, String> superPomPluginManagem

debugVersionMap( "final aggregate version map", excludePluginManagement );

Model originalModel;
try
{
originalModel =
modelInterpolator.interpolate( getProject().getOriginalModel(), getProject().getBasedir(),
new DefaultProjectBuilderConfiguration().setExecutionProperties( getProject().getProperties() ),
true );
}
catch ( ModelInterpolationException e )
{
throw new MojoExecutionException( e.getMessage(), e );
}
ModelBuildingRequest modelBuildingRequest = new DefaultModelBuildingRequest();
modelBuildingRequest.setUserProperties(getProject().getProperties());
Model originalModel = modelInterpolator.interpolateModel( getProject().getOriginalModel(), getProject().getBasedir(),
modelBuildingRequest, new IgnoringModelProblemCollector() );

try
{
addProjectPlugins( plugins, originalModel.getBuild().getPluginManagement().getPlugins(),
Expand Down Expand Up @@ -1800,4 +1791,12 @@ private static int compare( ArtifactVersion a, ArtifactVersion b )
{
return a.compareTo( b );
}

private static class IgnoringModelProblemCollector implements ModelProblemCollector {
@Override
public void add(Severity severity, String message, InputLocation location, Exception cause) {
// ignore
}
}

}