[sling-slingfeature-maven-plugin] branch master updated: Avoid using deprecated Maven Project methods - use alternative from MavenSession

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 6249085  Avoid using deprecated Maven Project methods - use 
alternative from MavenSession
6249085 is described below

commit 6249085c4b79b1f31c2b65f5c9368c79d0a24da4
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Jul 9 14:13:59 2020 +0200

    Avoid using deprecated Maven Project methods - use alternative from 
MavenSession
---
 .../feature/maven/mojos/FeatureLauncherMojo.java   |  2 +-
 .../maven/mojos/FeatureLauncherMojoTest.java       | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/maven/mojos/FeatureLauncherMojo.java 
b/src/main/java/org/apache/sling/feature/maven/mojos/FeatureLauncherMojo.java
index b1bef4c..be10dbf 100644
--- 
a/src/main/java/org/apache/sling/feature/maven/mojos/FeatureLauncherMojo.java
+++ 
b/src/main/java/org/apache/sling/feature/maven/mojos/FeatureLauncherMojo.java
@@ -153,7 +153,7 @@ public class FeatureLauncherMojo extends 
AbstractIncludingFeatureMojo {
                 handleFile(arguments, file, "-f");
             }
         }
-        ArtifactRepository artifactRepository = 
this.project.getProjectBuildingRequest().getLocalRepository();
+        ArtifactRepository artifactRepository = 
this.mavenSession.getProjectBuildingRequest().getLocalRepository();
         String localPath = artifactRepository.getBasedir();
         if(featureArchiveClassifiers != null && 
!featureArchiveClassifiers.isEmpty()) {
             for (String featureArchiveClassifier : featureArchiveClassifiers) {
diff --git 
a/src/test/java/org/apache/sling/feature/maven/mojos/FeatureLauncherMojoTest.java
 
b/src/test/java/org/apache/sling/feature/maven/mojos/FeatureLauncherMojoTest.java
index b0460ad..ea54910 100644
--- 
a/src/test/java/org/apache/sling/feature/maven/mojos/FeatureLauncherMojoTest.java
+++ 
b/src/test/java/org/apache/sling/feature/maven/mojos/FeatureLauncherMojoTest.java
@@ -40,6 +40,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Build;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -95,12 +96,14 @@ public class FeatureLauncherMojoTest {
         project.setVersion("1.0.1");
         project.setBuild(mockBuild);
         project.setContextValue(cacheKey, featureMap);
+        MavenSession session = mock(MavenSession.class);
         ProjectBuildingRequest projectBuildingRequest = 
mock(ProjectBuildingRequest.class);
-        project.setProjectBuildingRequest(projectBuildingRequest);
+        
when(session.getProjectBuildingRequest()).thenReturn(projectBuildingRequest);
         ArtifactRepository artifactRepository = mock(ArtifactRepository.class);
         
when(projectBuildingRequest.getLocalRepository()).thenReturn(artifactRepository);
         when(artifactRepository.getBasedir()).thenReturn("");
         mojo.project = project;
+        mojo.mavenSession = session;
 
         doNothing().when(mojo).checkPreconditions();
         final List<String> arguments = new ArrayList<>();
@@ -152,12 +155,14 @@ public class FeatureLauncherMojoTest {
         project.setVersion("1.0.1");
         project.setBuild(mockBuild);
         project.setContextValue(cacheKey, featureMap);
+        MavenSession session = mock(MavenSession.class);
         ProjectBuildingRequest projectBuildingRequest = 
mock(ProjectBuildingRequest.class);
-        project.setProjectBuildingRequest(projectBuildingRequest);
+        
when(session.getProjectBuildingRequest()).thenReturn(projectBuildingRequest);
         ArtifactRepository artifactRepository = mock(ArtifactRepository.class);
         
when(projectBuildingRequest.getLocalRepository()).thenReturn(artifactRepository);
         when(artifactRepository.getBasedir()).thenReturn("");
         mojo.project = project;
+        mojo.mavenSession = session;
 
         doNothing().when(mojo).checkPreconditions();
         final List<String> arguments = new ArrayList<>();
@@ -199,12 +204,14 @@ public class FeatureLauncherMojoTest {
         project.setVersion("1.0.1");
         project.setBuild(mockBuild);
         project.setContextValue(cacheKey, featureMap);
+        MavenSession session = mock(MavenSession.class);
         ProjectBuildingRequest projectBuildingRequest = 
mock(ProjectBuildingRequest.class);
-        project.setProjectBuildingRequest(projectBuildingRequest);
+        
when(session.getProjectBuildingRequest()).thenReturn(projectBuildingRequest);
         ArtifactRepository artifactRepository = mock(ArtifactRepository.class);
         
when(projectBuildingRequest.getLocalRepository()).thenReturn(artifactRepository);
         when(artifactRepository.getBasedir()).thenReturn("");
         mojo.project = project;
+        mojo.mavenSession = session;
 
         doNothing().when(mojo).checkPreconditions();
 
@@ -235,12 +242,14 @@ public class FeatureLauncherMojoTest {
         project.setVersion("1.0.1");
         project.setBuild(mockBuild);
         project.setContextValue(cacheKey, featureMap);
+        MavenSession session = mock(MavenSession.class);
         ProjectBuildingRequest projectBuildingRequest = 
mock(ProjectBuildingRequest.class);
-        project.setProjectBuildingRequest(projectBuildingRequest);
+        
when(session.getProjectBuildingRequest()).thenReturn(projectBuildingRequest);
         ArtifactRepository artifactRepository = mock(ArtifactRepository.class);
         
when(projectBuildingRequest.getLocalRepository()).thenReturn(artifactRepository);
         when(artifactRepository.getBasedir()).thenReturn("");
         mojo.project = project;
+        mojo.mavenSession = session;
 
         doNothing().when(mojo).checkPreconditions();
 
@@ -275,13 +284,14 @@ public class FeatureLauncherMojoTest {
         project.setVersion("1.0.1");
         project.setBuild(mockBuild);
         project.setContextValue(cacheKey, featureMap);
+        MavenSession session = mock(MavenSession.class);
         ProjectBuildingRequest projectBuildingRequest = 
mock(ProjectBuildingRequest.class);
-        project.setProjectBuildingRequest(projectBuildingRequest);
+        
when(session.getProjectBuildingRequest()).thenReturn(projectBuildingRequest);
         ArtifactRepository artifactRepository = mock(ArtifactRepository.class);
         
when(projectBuildingRequest.getLocalRepository()).thenReturn(artifactRepository);
         when(artifactRepository.getBasedir()).thenReturn("");
         mojo.project = project;
-
+        mojo.mavenSession = session;
         doNothing().when(mojo).checkPreconditions();
 
         mojo.execute();