Skip to content

Commit 67ecd33

Browse files
gnodetmichael-o
authored andcommitted
[MPIR-466] ModulesReport/IndexReport do not pass a complete building request to renderer
This closes #75
1 parent 73658c3 commit 67ecd33

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

src/main/java/org/apache/maven/report/projectinfo/IndexReport.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.maven.plugins.annotations.Mojo;
2929
import org.apache.maven.project.MavenProject;
3030
import org.apache.maven.project.ProjectBuilder;
31+
import org.apache.maven.project.ProjectBuildingRequest;
3132
import org.codehaus.plexus.i18n.I18N;
3233

3334
/**
@@ -66,6 +67,7 @@ public void executeReport(Locale locale) {
6667
project,
6768
getReactorProjects(),
6869
projectBuilder,
70+
getSession().getProjectBuildingRequest(),
6971
localRepository,
7072
getName(locale),
7173
getDescription(locale),
@@ -106,6 +108,7 @@ private static class ProjectIndexRenderer extends ModulesReport.ModulesRenderer
106108
MavenProject project,
107109
List<MavenProject> reactorProjects,
108110
ProjectBuilder projectBuilder,
111+
ProjectBuildingRequest buildingRequest,
109112
ArtifactRepository localRepository,
110113
String title,
111114
String description,
@@ -114,7 +117,17 @@ private static class ProjectIndexRenderer extends ModulesReport.ModulesRenderer
114117
Locale locale,
115118
Log log,
116119
SiteTool siteTool) {
117-
super(sink, project, reactorProjects, projectBuilder, localRepository, i18n, locale, log, siteTool);
120+
super(
121+
sink,
122+
project,
123+
reactorProjects,
124+
projectBuilder,
125+
buildingRequest,
126+
localRepository,
127+
i18n,
128+
locale,
129+
log,
130+
siteTool);
118131

119132
this.title = title;
120133

src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public void executeReport(Locale locale) {
6767
getProject(),
6868
getReactorProjects(),
6969
projectBuilder,
70+
getSession().getProjectBuildingRequest(),
7071
localRepository,
7172
getI18N(locale),
7273
locale,
@@ -102,6 +103,8 @@ static class ModulesRenderer extends AbstractProjectInfoRenderer {
102103

103104
protected ProjectBuilder projectBuilder;
104105

106+
protected ProjectBuildingRequest buildingRequest;
107+
105108
protected ArtifactRepository localRepository;
106109

107110
protected SiteTool siteTool;
@@ -111,6 +114,7 @@ static class ModulesRenderer extends AbstractProjectInfoRenderer {
111114
MavenProject project,
112115
List<MavenProject> reactorProjects,
113116
ProjectBuilder projectBuilder,
117+
ProjectBuildingRequest buildingRequest,
114118
ArtifactRepository localRepository,
115119
I18N i18n,
116120
Locale locale,
@@ -121,6 +125,7 @@ static class ModulesRenderer extends AbstractProjectInfoRenderer {
121125
this.project = project;
122126
this.reactorProjects = reactorProjects;
123127
this.projectBuilder = projectBuilder;
128+
this.buildingRequest = buildingRequest;
124129
this.localRepository = localRepository;
125130
this.siteTool = siteTool;
126131
this.log = log;
@@ -157,7 +162,7 @@ protected void renderBody() {
157162

158163
final String baseUrl = getDistMgmntSiteUrl(project);
159164

160-
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
165+
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest(this.buildingRequest);
161166
buildingRequest.setLocalRepository(localRepository);
162167
buildingRequest.setProcessPlugins(false);
163168

0 commit comments

Comments
 (0)