From b1b55bb65c7379e14ad6fd2bded7b0b887ebdb81 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Wed, 29 Jan 2025 00:03:40 +0100 Subject: [PATCH] [MPIR-476] Remove direct usage of localRepository as Mojo parameter --- .../maven/report/projectinfo/AbstractProjectInfoReport.java | 6 ------ .../report/projectinfo/DependencyManagementReport.java | 2 +- .../org/apache/maven/report/projectinfo/IndexReport.java | 2 +- .../org/apache/maven/report/projectinfo/ModulesReport.java | 2 +- .../plugin-configs/ci-management-plugin-config.xml | 1 - .../ci-management-plugin-with-ci-section-config.xml | 1 - .../plugin-configs/custom-bundle/plugin-config.xml | 1 - .../resources/plugin-configs/dependencies-plugin-config.xml | 1 - .../plugin-configs/dependency-convergence-plugin-config.xml | 1 - .../plugin-configs/dependency-management-plugin-config.xml | 1 - src/test/resources/plugin-configs/index-plugin-config.xml | 1 - .../plugin-configs/issue-management-plugin-config.xml | 1 - .../plugin-configs/licenses-plugin-config-linkonly.xml | 1 - .../resources/plugin-configs/licenses-plugin-config.xml | 1 - .../plugin-configs/mailing-lists-plugin-config-fr.xml | 1 - .../mailing-lists-plugin-config-invalidlink.xml | 1 - .../plugin-configs/mailing-lists-plugin-config.xml | 1 - src/test/resources/plugin-configs/modules-plugin-config.xml | 1 - ...modules-variable-settings-interpolated-plugin-config.xml | 1 - .../plugin-management-plugin-config-MPIR-375.xml | 1 - .../plugin-configs/plugin-management-plugin-config.xml | 1 - src/test/resources/plugin-configs/scm-plugin-config.xml | 1 - .../plugin-configs/scm-wrong-url-plugin-config.xml | 1 - src/test/resources/plugin-configs/summary-plugin-config.xml | 1 - src/test/resources/plugin-configs/team-plugin-config.xml | 1 - 25 files changed, 3 insertions(+), 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 index cb32096d..8de0af0c 100644 --- 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 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 index f09e1a88..935e3861 100644 --- 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 index 49d3c0d2..6eb650f7 100644 --- 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 index 7557c1fd..6ebc3af6 100644 --- 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 index 56eff3d0..c43ca526 100644 --- 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. maven-project-info-reports-plugin target/test-harness/ci-mangement - ${localRepository} 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 index b329f91c..73c71099 100644 --- 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. maven-project-info-reports-plugin target/test-harness/ci-management-with-ci-section - ${localRepository} diff --git a/src/test/resources/plugin-configs/custom-bundle/plugin-config.xml b/src/test/resources/plugin-configs/custom-bundle/plugin-config.xml index 0b3b9ee4..f8bbbb64 100644 --- 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. maven-project-info-reports-plugin target/test-harness/mailing-lists - ${localRepository} ${basedir}/src/test/resources/plugin-configs/custom-bundle/src/site/custom/project-info-reports.properties diff --git a/src/test/resources/plugin-configs/dependencies-plugin-config.xml b/src/test/resources/plugin-configs/dependencies-plugin-config.xml index eb97add7..01761108 100644 --- 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. maven-project-info-reports-plugin target/test-harness/dependencies - ${localRepository} diff --git a/src/test/resources/plugin-configs/dependency-convergence-plugin-config.xml b/src/test/resources/plugin-configs/dependency-convergence-plugin-config.xml index e252f05d..12b1a0d7 100644 --- 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. maven-project-info-reports-plugin target/test-harness/dependency-convergence - ${localRepository} diff --git a/src/test/resources/plugin-configs/dependency-management-plugin-config.xml b/src/test/resources/plugin-configs/dependency-management-plugin-config.xml index 7630a657..c8781efd 100644 --- 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. maven-project-info-reports-plugin target/test-harness/dependency-management - ${localRepository} diff --git a/src/test/resources/plugin-configs/index-plugin-config.xml b/src/test/resources/plugin-configs/index-plugin-config.xml index 7cc0fc53..2efb719a 100644 --- 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. maven-project-info-reports-plugin target/test-harness/index - ${localRepository} diff --git a/src/test/resources/plugin-configs/issue-management-plugin-config.xml b/src/test/resources/plugin-configs/issue-management-plugin-config.xml index 56c6f49b..403952f2 100644 --- 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. maven-project-info-reports-plugin target/test-harness/issue-management - ${localRepository} diff --git a/src/test/resources/plugin-configs/licenses-plugin-config-linkonly.xml b/src/test/resources/plugin-configs/licenses-plugin-config-linkonly.xml index 62c32657..57b6cee2 100644 --- 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. maven-project-info-reports-plugin target/test-harness/licenses - ${localRepository} false diff --git a/src/test/resources/plugin-configs/licenses-plugin-config.xml b/src/test/resources/plugin-configs/licenses-plugin-config.xml index d03ba8e1..18edf677 100644 --- 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. maven-project-info-reports-plugin target/test-harness/licenses - ${localRepository} false 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 index c50e7eb9..afa972dc 100644 --- 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. maven-project-info-reports-plugin target/test-harness/mailing-lists - ${localRepository} fr 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 index 3ed9413e..37f76984 100644 --- 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. maven-project-info-reports-plugin target/test-harness/mailing-lists - ${localRepository} diff --git a/src/test/resources/plugin-configs/mailing-lists-plugin-config.xml b/src/test/resources/plugin-configs/mailing-lists-plugin-config.xml index c35c7104..7a27e307 100644 --- 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. maven-project-info-reports-plugin target/test-harness/mailing-lists - ${localRepository} diff --git a/src/test/resources/plugin-configs/modules-plugin-config.xml b/src/test/resources/plugin-configs/modules-plugin-config.xml index 1340a643..69943c1d 100644 --- 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. maven-project-info-reports-plugin target/test-harness/modules - ${localRepository} 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 index 1560b785..474bd72b 100644 --- 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. maven-project-info-reports-plugin target/test-harness/modules - ${localRepository} 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 index 114447ab..51b3a4ad 100644 --- 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. maven-project-info-reports-plugin target/test-harness/plugin-management - ${localRepository} diff --git a/src/test/resources/plugin-configs/plugin-management-plugin-config.xml b/src/test/resources/plugin-configs/plugin-management-plugin-config.xml index ac962fe1..2e624494 100644 --- 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. maven-project-info-reports-plugin target/test-harness/plugin-management - ${localRepository} diff --git a/src/test/resources/plugin-configs/scm-plugin-config.xml b/src/test/resources/plugin-configs/scm-plugin-config.xml index 6f0cdede..9d7f5cbd 100644 --- 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. target/test-harness/scm - ${localRepository} test-artifactId 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 index ceaf5aeb..9de3d921 100644 --- 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. target/test-harness/scm - ${localRepository} test-artifactId diff --git a/src/test/resources/plugin-configs/summary-plugin-config.xml b/src/test/resources/plugin-configs/summary-plugin-config.xml index e53e5748..03d9cf1f 100644 --- 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. maven-project-info-reports-plugin target/test-harness/summary - ${localRepository} diff --git a/src/test/resources/plugin-configs/team-plugin-config.xml b/src/test/resources/plugin-configs/team-plugin-config.xml index d6f2f895..630ee204 100644 --- 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. maven-project-info-reports-plugin target/test-harness/team - ${localRepository}