From 71523af2e962de0eeade9f190ba3a6556a7496ce Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 14 Mar 2022 14:27:45 +0100 Subject: [PATCH] [MNG-7391] Fix MojosExecutionStrategy lookup to be able to look into the SessionScope --- .../org/apache/maven/lifecycle/internal/MojoExecutor.java | 7 ++++--- .../maven/lifecycle/internal/stub/MojoExecutorStub.java | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java index 28847cabe5c2..6c089863cc61 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java @@ -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; @@ -82,7 +83,7 @@ public class MojoExecutor private final ReadWriteLock aggregatorLock = new ReentrantReadWriteLock(); - private final MojosExecutionStrategy mojosExecutionStrategy; + private final Provider mojosExecutionStrategy; @Inject public MojoExecutor( @@ -90,7 +91,7 @@ public MojoExecutor( MavenPluginManager mavenPluginManager, LifecycleDependencyResolver lifeCycleDependencyResolver, ExecutionEventCatapult eventCatapult, - MojosExecutionStrategy mojosExecutionStrategy ) + Provider mojosExecutionStrategy ) { this.pluginManager = pluginManager; this.mavenPluginManager = mavenPluginManager; @@ -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 diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java index 57eacb1fc6f4..a47b6076a09f 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java @@ -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; @@ -49,7 +51,7 @@ public MojoExecutorStub( MavenPluginManager mavenPluginManager, LifecycleDependencyResolver lifeCycleDependencyResolver, ExecutionEventCatapult eventCatapult, - MojosExecutionStrategy mojosExecutionStrategy ) + Provider mojosExecutionStrategy ) { super( pluginManager, mavenPluginManager, lifeCycleDependencyResolver, eventCatapult, mojosExecutionStrategy ); }