Inject MavenSession into Mojo

src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java

@@ -278,12 +278,6 @@ public abstract class AbstractWarMojo extends AbstractMojo {
     @Parameter
     private List<String> nonFilteredFileExtensions;
 
-    /**
-     * @since 2.1-alpha-2
-     */
-    @Parameter(defaultValue = "${session}", readonly = true, required = true)
-    private MavenSession session;
-
     /**
      * To filter deployment descriptors. <b>Disabled by default.</b>
      *
@@ -379,15 +373,19 @@ public abstract class AbstractWarMojo extends AbstractMojo {
 
     private final MavenResourcesFiltering mavenResourcesFiltering;
 
+    private final MavenSession session;
+
     protected AbstractWarMojo(
             ArtifactHandlerManager artifactHandlerManager,
             ArchiverManager archiverManager,
             MavenFileFilter mavenFileFilter,
-            MavenResourcesFiltering mavenResourcesFiltering) {
+            MavenResourcesFiltering mavenResourcesFiltering,
+            MavenSession session) {
         this.artifactHandlerManager = artifactHandlerManager;
         this.archiverManager = archiverManager;
         this.mavenFileFilter = mavenFileFilter;
         this.mavenResourcesFiltering = mavenResourcesFiltering;
+        this.session = session;
         try {
             this.jarArchiver = (JarArchiver) archiverManager.getArchiver("jar");
         } catch (NoSuchArchiverException e) {

src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java

@@ -21,6 +21,7 @@
 import javax.inject.Inject;
 
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -44,8 +45,9 @@ public WarExplodedMojo(
             ArtifactHandlerManager artifactHandlerManager,
             ArchiverManager archiverManager,
             MavenFileFilter mavenFileFilter,
-            MavenResourcesFiltering mavenResourcesFiltering) {
-        super(artifactHandlerManager, archiverManager, mavenFileFilter, mavenResourcesFiltering);
+            MavenResourcesFiltering mavenResourcesFiltering,
+            MavenSession session) {
+        super(artifactHandlerManager, archiverManager, mavenFileFilter, mavenResourcesFiltering, session);
     }
 
     @Override

src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java

@@ -21,6 +21,7 @@
 import javax.inject.Inject;
 
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -40,8 +41,9 @@ public WarInPlaceMojo(
             ArtifactHandlerManager artifactHandlerManager,
             ArchiverManager archiverManager,
             MavenFileFilter mavenFileFilter,
-            MavenResourcesFiltering mavenResourcesFiltering) {
-        super(artifactHandlerManager, archiverManager, mavenFileFilter, mavenResourcesFiltering);
+            MavenResourcesFiltering mavenResourcesFiltering,
+            MavenSession session) {
+        super(artifactHandlerManager, archiverManager, mavenFileFilter, mavenResourcesFiltering, session);
     }
 
     @Override

src/main/java/org/apache/maven/plugins/war/WarMojo.java

@@ -32,6 +32,7 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -136,8 +137,9 @@ public WarMojo(
             ArchiverManager archiverManager,
             MavenFileFilter mavenFileFilter,
             MavenResourcesFiltering mavenResourcesFiltering,
-            MavenProjectHelper projectHelper) {
-        super(artifactHandlerManager, archiverManager, mavenFileFilter, mavenResourcesFiltering);
+            MavenProjectHelper projectHelper,
+            MavenSession session) {
+        super(artifactHandlerManager, archiverManager, mavenFileFilter, mavenResourcesFiltering, session);
         this.projectHelper = projectHelper;
     }
 

src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java

@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.maven.plugin.testing.stubs.ArtifactStub;
@@ -94,7 +93,7 @@ protected File setUpMojo(final String testId, ArtifactStub[] artifactStubs, Stri
             }
         }
 
-        configureMojo(mojo, new LinkedList<>(), classesDir, webAppSource, webAppDirectory, project);
+        configureMojo(mojo, classesDir, webAppSource, webAppDirectory, project);
         setVariableValueToObject(mojo, "workDirectory", workDirectory);
 
         return webAppDirectory;

src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java

@@ -21,7 +21,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
-import java.util.List;
 
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionRequest;
@@ -30,7 +29,6 @@
 import org.apache.maven.plugin.testing.stubs.ArtifactStub;
 import org.apache.maven.plugins.war.stub.MavenProjectBasicStub;
 import org.apache.maven.plugins.war.stub.WarOverlayStub;
-import org.apache.maven.shared.filtering.MavenFileFilter;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
@@ -47,35 +45,30 @@ public abstract class AbstractWarMojoTest extends AbstractMojoTestCase {
 
     protected abstract File getTestDirectory() throws Exception;
 
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        MavenExecutionRequest request = new DefaultMavenExecutionRequest()
+                .setSystemProperties(System.getProperties())
+                .setStartTime(new Date());
+
+        MavenSession mavenSession =
+                new MavenSession((PlexusContainer) null, (RepositorySystemSession) null, request, null);
+        getContainer().addComponent(mavenSession, MavenSession.class.getName());
+    }
     /**
      * initialize required parameters
      *
      * @param mojo The mojo to be tested.
-     * @param filters The list of filters.
      * @param classesDir The classes' directory.
      * @param webAppSource The webAppSource.
      * @param webAppDir The webAppDir folder.
      * @param project The Maven project.
      * @throws Exception in case of errors
      */
     protected void configureMojo(
-            AbstractWarMojo mojo,
-            List<String> filters,
-            File classesDir,
-            File webAppSource,
-            File webAppDir,
-            MavenProjectBasicStub project)
+            AbstractWarMojo mojo, File classesDir, File webAppSource, File webAppDir, MavenProjectBasicStub project)
             throws Exception {
-        setVariableValueToObject(mojo, "filters", filters);
-        setVariableValueToObject(mojo, "mavenFileFilter", lookup(MavenFileFilter.class.getName()));
-
-        MavenExecutionRequest request = new DefaultMavenExecutionRequest()
-                .setSystemProperties(System.getProperties())
-                .setStartTime(new Date());
-
-        MavenSession mavenSession =
-                new MavenSession((PlexusContainer) null, (RepositorySystemSession) null, request, null);
-        setVariableValueToObject(mojo, "session", mavenSession);
         setVariableValueToObject(mojo, "outdatedCheckPath", "WEB-INF/lib/");
         mojo.setClassesDirectory(classesDir);
         mojo.setWarSourceDirectory(webAppSource);

src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java

@@ -43,6 +43,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugins.war.stub.MavenProjectBasicStub;
 import org.apache.maven.plugins.war.stub.ResourceStub;
 import org.codehaus.plexus.util.FileUtils;
@@ -96,14 +97,16 @@ public void testExplodedWarWithResourceFiltering() throws Exception {
         FileUtils.fileWrite(sampleResourceWDir.getAbsolutePath(), content);
         FileUtils.fileWrite(sampleResource.getAbsolutePath(), content);
 
-        System.setProperty("system.property", "system-property-value");
+        lookup(MavenSession.class).getSystemProperties().setProperty("system.property", "system-property-value");
 
         // configure mojo
         project.addProperty("is_this_simple", "i_think_so");
         resources[0].setDirectory(webAppResource.getAbsolutePath());
         resources[0].setFiltering(true);
-        this.configureMojo(mojo, filterList, classesDir, webAppSource, webAppDirectory, project);
+        this.configureMojo(mojo, classesDir, webAppSource, webAppDirectory, project);
         setVariableValueToObject(mojo, "webResources", resources);
+        setVariableValueToObject(mojo, "filters", filterList);
+
         mojo.execute();
 
         // validate operation
@@ -151,8 +154,8 @@ public void testExplodedWarWithResourceFiltering() throws Exception {
                 reader.readLine());
 
         // update property, and generate again
-        System.setProperty("system.property", "new-system-property-value");
-        this.configureMojo(mojo, filterList, classesDir, webAppSource, webAppDirectory, project);
+        lookup(MavenSession.class).getSystemProperties().setProperty("system.property", "new-system-property-value");
+        this.configureMojo(mojo, classesDir, webAppSource, webAppDirectory, project);
 
         mojo.execute();