[MPIR-476] Remove direct usage of localRepository as Mojo parameter

apache · Jan 29, 2025 · b1b55bb · b1b55bb
1 parent 03b9832
commit b1b55bb
Show file tree

Hide file tree

Showing 25 changed files with 3 additions and 30 deletions.
diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
@@ -119,12 +119,6 @@ public abstract class AbstractProjectInfoReport extends AbstractMavenReport {
     @Parameter
     private List<LicenseMapping> licenseMappings;
 
-    /**
-     * The local repository.
-     */
-    @Parameter(defaultValue = "${localRepository}", readonly = true, required = true)
-    protected ArtifactRepository localRepository;
-
     // ----------------------------------------------------------------------
     // Mojo components
     // ----------------------------------------------------------------------

diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
@@ -96,7 +96,7 @@ public boolean canGenerateReport() throws MavenReportException {
     public void executeReport(Locale locale) {
         ProjectBuildingRequest buildingRequest =
                 new DefaultProjectBuildingRequest(getSession().getProjectBuildingRequest());
-        buildingRequest.setLocalRepository(localRepository);
+        buildingRequest.setLocalRepository(getSession().getLocalRepository());
         buildingRequest.setRemoteRepositories(remoteRepositories);
         buildingRequest.setPluginArtifactRepositories(pluginRepositories);
         buildingRequest.setProcessPlugins(false);

diff --git a/src/main/java/org/apache/maven/report/projectinfo/IndexReport.java b/src/main/java/org/apache/maven/report/projectinfo/IndexReport.java
@@ -76,7 +76,7 @@ public void executeReport(Locale locale) {
                 getReactorProjects(),
                 projectBuilder,
                 getSession().getProjectBuildingRequest(),
-                localRepository,
+                getSession().getLocalRepository(),
                 getName(locale),
                 getDescription(locale),
                 getSink(),

diff --git a/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java b/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
@@ -78,7 +78,7 @@ public void executeReport(Locale locale) {
                         getReactorProjects(),
                         projectBuilder,
                         getSession().getProjectBuildingRequest(),
-                        localRepository,
+                        getSession().getLocalRepository(),
                         getI18N(locale),
                         locale,
                         getLog(),

diff --git a/src/test/resources/plugin-configs/ci-management-plugin-config.xml b/src/test/resources/plugin-configs/ci-management-plugin-config.xml
@@ -39,7 +39,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/ci-mangement</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.CiManagementStub"/>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/ci-management-plugin-with-ci-section-config.xml b/src/test/resources/plugin-configs/ci-management-plugin-with-ci-section-config.xml
@@ -39,7 +39,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/ci-management-with-ci-section</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.CiManagementWithCiSectionStub"/>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/custom-bundle/plugin-config.xml b/src/test/resources/plugin-configs/custom-bundle/plugin-config.xml
@@ -52,7 +52,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/mailing-lists</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.MailingListsStub2"/>
           <customBundle>${basedir}/src/test/resources/plugin-configs/custom-bundle/src/site/custom/project-info-reports.properties</customBundle>
         </configuration>

diff --git a/src/test/resources/plugin-configs/dependencies-plugin-config.xml b/src/test/resources/plugin-configs/dependencies-plugin-config.xml
@@ -39,7 +39,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/dependencies</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.DependenciesStub"/>
           <settings implementation="org.apache.maven.report.projectinfo.stubs.SettingsStub"/>
         </configuration>

diff --git a/src/test/resources/plugin-configs/dependency-convergence-plugin-config.xml b/src/test/resources/plugin-configs/dependency-convergence-plugin-config.xml
@@ -39,7 +39,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/dependency-convergence</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.DependencyConvergenceStub"/>
           <reactorProjects>
             <project implementation="org.apache.maven.report.projectinfo.stubs.SubProject1Stub"/>

diff --git a/src/test/resources/plugin-configs/dependency-management-plugin-config.xml b/src/test/resources/plugin-configs/dependency-management-plugin-config.xml
@@ -48,7 +48,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/dependency-management</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.DependencyManagementStub"/>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/index-plugin-config.xml b/src/test/resources/plugin-configs/index-plugin-config.xml
@@ -39,7 +39,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/index</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.IndexStub"/>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/issue-management-plugin-config.xml b/src/test/resources/plugin-configs/issue-management-plugin-config.xml
@@ -43,7 +43,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/issue-management</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.IssueManagementStub"/>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/licenses-plugin-config-linkonly.xml b/src/test/resources/plugin-configs/licenses-plugin-config-linkonly.xml
@@ -46,7 +46,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/licenses</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.LicensesStub"/>
           <settings implementation="org.apache.maven.report.projectinfo.stubs.SettingsStub"/>
           <offline>false</offline>

diff --git a/src/test/resources/plugin-configs/licenses-plugin-config.xml b/src/test/resources/plugin-configs/licenses-plugin-config.xml
@@ -46,7 +46,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/licenses</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.LicensesStub"/>
           <settings implementation="org.apache.maven.report.projectinfo.stubs.SettingsStub"/>
           <offline>false</offline>

diff --git a/src/test/resources/plugin-configs/mailing-lists-plugin-config-fr.xml b/src/test/resources/plugin-configs/mailing-lists-plugin-config-fr.xml
@@ -52,7 +52,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/mailing-lists</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <locale>fr</locale>
           <project implementation="org.apache.maven.report.projectinfo.stubs.MailingListsStub"/>
         </configuration>

diff --git a/src/test/resources/plugin-configs/mailing-lists-plugin-config-invalidlink.xml b/src/test/resources/plugin-configs/mailing-lists-plugin-config-invalidlink.xml
@@ -47,7 +47,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/mailing-lists</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.MailingListsInvalidLinkStub"/>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/mailing-lists-plugin-config.xml b/src/test/resources/plugin-configs/mailing-lists-plugin-config.xml
@@ -52,7 +52,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/mailing-lists</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.MailingListsStub"/>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/modules-plugin-config.xml b/src/test/resources/plugin-configs/modules-plugin-config.xml
@@ -43,7 +43,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/modules</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.ModulesStub"/>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/modules-variable-settings-interpolated-plugin-config.xml b/src/test/resources/plugin-configs/modules-variable-settings-interpolated-plugin-config.xml
@@ -42,7 +42,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/modules</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.ModulesVariableSettingInterpolationStub"/>
           <settings implementation="org.apache.maven.report.projectinfo.stubs.SettingsSitePublishVariableStub"/>
         </configuration>

diff --git a/src/test/resources/plugin-configs/plugin-management-plugin-config-MPIR-375.xml b/src/test/resources/plugin-configs/plugin-management-plugin-config-MPIR-375.xml
@@ -69,7 +69,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/plugin-management</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.PluginManagementMPIR375Stub"/>
 
           <pluginManagementExcludes>

diff --git a/src/test/resources/plugin-configs/plugin-management-plugin-config.xml b/src/test/resources/plugin-configs/plugin-management-plugin-config.xml
@@ -56,7 +56,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/plugin-management</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.PluginManagementStub"/>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/scm-plugin-config.xml b/src/test/resources/plugin-configs/scm-plugin-config.xml
@@ -45,7 +45,6 @@ under the License.
         <configuration>
           <outputDirectory>target/test-harness/scm</outputDirectory>
           <project implementation="org.apache.maven.report.projectinfo.stubs.ScmStub"/>
-          <localRepository>${localRepository}</localRepository>
           <checkoutDirectoryName>test-artifactId</checkoutDirectoryName>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/scm-wrong-url-plugin-config.xml b/src/test/resources/plugin-configs/scm-wrong-url-plugin-config.xml
@@ -40,7 +40,6 @@ under the License.
         <configuration>
           <outputDirectory>target/test-harness/scm</outputDirectory>
           <project implementation="org.apache.maven.report.projectinfo.stubs.ScmStub"/>
-          <localRepository>${localRepository}</localRepository>
           <checkoutDirectoryName>test-artifactId</checkoutDirectoryName>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/summary-plugin-config.xml b/src/test/resources/plugin-configs/summary-plugin-config.xml
@@ -39,7 +39,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/summary</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.SummaryStub"/>
         </configuration>
       </plugin>

diff --git a/src/test/resources/plugin-configs/team-plugin-config.xml b/src/test/resources/plugin-configs/team-plugin-config.xml
@@ -56,7 +56,6 @@ under the License.
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <configuration>
           <outputDirectory>target/test-harness/team</outputDirectory>
-          <localRepository>${localRepository}</localRepository>
           <project implementation="org.apache.maven.report.projectinfo.stubs.TeamStub"/>
         </configuration>
       </plugin>