Skip to content

[MNG-7391] Fix MojosExecutionStrategy lookup to be able to look into the SessionScope #693

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

Merged
gnodet merged 1 commit into from
Mar 15, 2022
Merged

[MNG-7391] Fix MojosExecutionStrategy lookup to be able to look into the SessionScope #693

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
7 changes: 4 additions & 3 deletions maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;

import org.apache.maven.artifact.Artifact;
Expand Down Expand Up @@ -82,15 +83,15 @@ public class MojoExecutor

private final ReadWriteLock aggregatorLock = new ReentrantReadWriteLock();

private final MojosExecutionStrategy mojosExecutionStrategy;
private final Provider<MojosExecutionStrategy> mojosExecutionStrategy;

@Inject
public MojoExecutor(
BuildPluginManager pluginManager,
MavenPluginManager mavenPluginManager,
LifecycleDependencyResolver lifeCycleDependencyResolver,
ExecutionEventCatapult eventCatapult,
MojosExecutionStrategy mojosExecutionStrategy )
Provider<MojosExecutionStrategy> mojosExecutionStrategy )
{
this.pluginManager = pluginManager;
this.mavenPluginManager = mavenPluginManager;
Expand Down Expand Up @@ -164,7 +165,7 @@ public void execute( final MavenSession session,

final PhaseRecorder phaseRecorder = new PhaseRecorder( session.getCurrentProject() );

mojosExecutionStrategy.execute( mojoExecutions, session, new MojoExecutionRunner()
mojosExecutionStrategy.get().execute( mojoExecutions, session, new MojoExecutionRunner()
{
@Override
public void run( MojoExecution mojoExecution ) throws LifecycleExecutionException
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -15,6 +15,8 @@

package org.apache.maven.lifecycle.internal.stub;

import javax.inject.Provider;

import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.internal.DependencyContext;
Expand Down Expand Up @@ -49,7 +51,7 @@ public MojoExecutorStub(
MavenPluginManager mavenPluginManager,
LifecycleDependencyResolver lifeCycleDependencyResolver,
ExecutionEventCatapult eventCatapult,
MojosExecutionStrategy mojosExecutionStrategy )
Provider<MojosExecutionStrategy> mojosExecutionStrategy )
{
super( pluginManager, mavenPluginManager, lifeCycleDependencyResolver, eventCatapult, mojosExecutionStrategy );
}
Expand Down