You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/03/15 05:56:14 UTC
[maven] branch master updated: [MNG-7391] Fix MojosExecutionStrategy lookup to be able to look into the SessionScope (#693)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 31193cb [MNG-7391] Fix MojosExecutionStrategy lookup to be able to look into the SessionScope (#693)
31193cb is described below
commit 31193cbf0c93205a63c8c7b372b09200f60e69f4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 15 06:56:07 2022 +0100
[MNG-7391] Fix MojosExecutionStrategy lookup to be able to look into the SessionScope (#693)
---
.../java/org/apache/maven/lifecycle/internal/MojoExecutor.java | 7 ++++---
.../org/apache/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 28847ca..6c08986 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 java.util.concurrent.locks.ReentrantReadWriteLock;
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> mojosExecutionStrategy;
@Inject
public MojoExecutor(
@@ -90,7 +91,7 @@ public class MojoExecutor
MavenPluginManager mavenPluginManager,
LifecycleDependencyResolver lifeCycleDependencyResolver,
ExecutionEventCatapult eventCatapult,
- MojosExecutionStrategy mojosExecutionStrategy )
+ Provider<MojosExecutionStrategy> mojosExecutionStrategy )
{
this.pluginManager = pluginManager;
this.mavenPluginManager = mavenPluginManager;
@@ -164,7 +165,7 @@ public class MojoExecutor
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 57eacb1..a47b607 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 class MojoExecutorStub
MavenPluginManager mavenPluginManager,
LifecycleDependencyResolver lifeCycleDependencyResolver,
ExecutionEventCatapult eventCatapult,
- MojosExecutionStrategy mojosExecutionStrategy )
+ Provider<MojosExecutionStrategy> mojosExecutionStrategy )
{
super( pluginManager, mavenPluginManager, lifeCycleDependencyResolver, eventCatapult, mojosExecutionStrategy );
}