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

[MNG-5561] Plugin relocation loses configuration #642

Closed
wants to merge 1 commit into from
Closed

[MNG-5561] Plugin relocation loses configuration #642

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
4 changes: 2 additions & 2 deletions ...e/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ public class DefaultMojoExecutionConfigurator
@Override
public void configure( MavenProject project, MojoExecution mojoExecution, boolean allowPluginLevelConfig )
{
String g = mojoExecution.getGroupId();
String g = mojoExecution.getPlugin().getGroupId();

String a = mojoExecution.getArtifactId();
String a = mojoExecution.getPlugin().getArtifactId();

Plugin plugin = findPlugin( g, a, project.getBuildPlugins() );

Expand Down
2 changes: 1 addition & 1 deletion ...n-core/src/test/java/org/apache/maven/lifecycle/internal/stub/BuildPluginManagerStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public PluginDescriptor loadPlugin( Plugin plugin, List<RemoteRepository> reposi
public MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, List<RemoteRepository> repositories,
RepositorySystemSession session )
{
return MojoExecutorStub.createMojoDescriptor( plugin.getKey() );
return MojoExecutorStub.createMojoDescriptor( plugin );
}

public ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor )
Expand Down
9 changes: 6 additions & 3 deletions maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.maven.lifecycle.internal.MojoExecutor;
import org.apache.maven.lifecycle.internal.PhaseRecorder;
import org.apache.maven.lifecycle.internal.ProjectIndex;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
Expand Down Expand Up @@ -54,12 +55,14 @@ public void execute( MavenSession session, List<MojoExecution> mojoExecutions, P
}


public static MojoDescriptor createMojoDescriptor( String mojoDescription )
public static MojoDescriptor createMojoDescriptor( Plugin plugin )
{
final PluginDescriptor descriptor = new PluginDescriptor();
descriptor.setArtifactId( mojoDescription );
descriptor.setGroupId( plugin.getGroupId() );
descriptor.setArtifactId( plugin.getArtifactId() );
descriptor.setPlugin( plugin );
descriptor.setVersion( plugin.getVersion() );
final MojoDescriptor mojoDescriptor = new MojoDescriptor();
mojoDescriptor.setDescription( mojoDescription );
mojoDescriptor.setPluginDescriptor( descriptor );
return mojoDescriptor;
}
Expand Down