File tree Expand file tree Collapse file tree 11 files changed +19
-43
lines changed
maven-plugin-report-plugin
plugin-report-annotations/src/main/java/org
plugin-report-with-javadoc-links
main/java/org/apache/maven/plugin/plugin/report
maven-plugin-tools-generators Expand file tree Collapse file tree 11 files changed +19
-43
lines changed Original file line number Diff line number Diff line change 39
39
40
40
<properties >
41
41
<it .debug>true</it .debug>
42
- <doxiaVersion >1.11.1 </doxiaVersion >
42
+ <doxiaVersion >2.0.0-M12 </doxiaVersion >
43
43
</properties >
44
44
45
45
<dependencies >
120
120
<dependency >
121
121
<groupId >org.apache.commons</groupId >
122
122
<artifactId >commons-lang3</artifactId >
123
- <version >3.8.1</version >
124
- <!-- same version as used by doxia site renderer -->
123
+ <version >3.16.0</version >
125
124
</dependency >
126
125
<!-- Plexus -->
127
126
<dependency >
271
270
<settingsFile >src/it/settings.xml</settingsFile >
272
271
<streamLogsOnFailures >true</streamLogsOnFailures >
273
272
<filterProperties >
274
- <sitePluginVersion >3.12.1 </sitePluginVersion >
275
- <projectInfoReportsPlugin >3.4.1 </projectInfoReportsPlugin >
273
+ <sitePluginVersion >3.20.0 </sitePluginVersion >
274
+ <projectInfoReportsPlugin >3.7.0 </projectInfoReportsPlugin >
276
275
<antVersion >${antVersion} </antVersion >
277
276
</filterProperties >
278
277
<properties >
Original file line number Diff line number Diff line change @@ -108,7 +108,6 @@ protected MavenProject getProject() {
108
108
*/
109
109
public boolean canGenerateReport () {
110
110
if (skip || skipReport ) {
111
- getLog ().info ("Maven Plugin Plugin Report generation skipped." );
112
111
return false ;
113
112
}
114
113
Original file line number Diff line number Diff line change @@ -101,9 +101,6 @@ under the License.
101
101
<groupId >org.apache.maven.plugins</groupId >
102
102
<artifactId >maven-site-plugin</artifactId >
103
103
<version >@sitePluginVersion@</version >
104
- <configuration >
105
- <locales >en</locales >
106
- </configuration >
107
104
</plugin >
108
105
</plugins >
109
106
</build >
Original file line number Diff line number Diff line change @@ -94,7 +94,7 @@ under the License.
94
94
<artifactId >maven-site-plugin</artifactId >
95
95
<version >@sitePluginVersion@</version >
96
96
<configuration >
97
- <locales >en ,de,fr</locales >
97
+ <locales >default ,de,fr</locales >
98
98
</configuration >
99
99
</plugin >
100
100
</plugins >
Original file line number Diff line number Diff line change @@ -102,7 +102,6 @@ protected MavenProject getProject() {
102
102
/** {@inheritDoc} */
103
103
public boolean canGenerateReport () {
104
104
if (skip || skipReport ) {
105
- getLog ().info ("Maven Plugin Plugin Report generation skipped." );
106
105
return false ;
107
106
}
108
107
Original file line number Diff line number Diff line change 37
37
import org .apache .commons .lang3 .StringUtils ;
38
38
import org .apache .maven .doxia .sink .Sink ;
39
39
import org .apache .maven .doxia .sink .impl .SinkEventAttributeSet .Semantics ;
40
- import org .apache .maven .doxia .util .HtmlTools ;
40
+ import org .apache .maven .doxia .util .DoxiaUtils ;
41
41
import org .apache .maven .plugin .descriptor .MojoDescriptor ;
42
42
import org .apache .maven .plugin .descriptor .Parameter ;
43
43
import org .apache .maven .plugin .logging .Log ;
@@ -260,7 +260,7 @@ private void renderParameterOverviewTableRow(Parameter parameter) {
260
260
renderTableCellWithCode (
261
261
format ("parameter.name" , parameter .getName ()),
262
262
// no need for additional URI encoding as it returns only URI safe characters
263
- Optional .of ("#" + HtmlTools .encodeId (parameter .getName ())));
263
+ Optional .of ("#" + DoxiaUtils .encodeId (parameter .getName ())));
264
264
265
265
// type
266
266
Map .Entry <String , Optional <String >> type = getLinkedType (parameter , true );
Original file line number Diff line number Diff line change @@ -326,7 +326,7 @@ private void renderUsageSection(boolean hasMavenReport) {
326
326
sb .append (" ..." ).append (Markup .EOL );
327
327
sb .append ("</project>" );
328
328
329
- verbatimText (sb .toString ());
329
+ verbatimSource (sb .toString ());
330
330
331
331
sink .paragraph ();
332
332
linkPatternedText (getI18nString ("configuration.end" ));
Original file line number Diff line number Diff line change @@ -163,7 +163,6 @@ public class PluginReport extends AbstractMavenReport {
163
163
@ Override
164
164
public boolean canGenerateReport () {
165
165
if (skip ) {
166
- getLog ().info ("Maven Plugin Plugin Report generation skipped." );
167
166
return false ;
168
167
}
169
168
@@ -273,7 +272,6 @@ public String getOutputName() {
273
272
*/
274
273
private void generateMojosDocumentation (PluginDescriptor pluginDescriptor , Locale locale )
275
274
throws MavenReportException {
276
-
277
275
if (pluginDescriptor .getMojos () != null ) {
278
276
for (MojoDescriptor descriptor : pluginDescriptor .getMojos ()) {
279
277
GoalRenderer renderer ;
Original file line number Diff line number Diff line change 81
81
<!-- other -->
82
82
<dependency >
83
83
<groupId >org.apache.velocity</groupId >
84
- <artifactId >velocity</artifactId >
84
+ <artifactId >velocity-engine-core </artifactId >
85
85
</dependency >
86
86
<dependency >
87
87
<groupId >org.slf4j</groupId >
Original file line number Diff line number Diff line change 47
47
</li >
48
48
</ul >
49
49
<subsection name =" Required Parameters" >
50
- <table border = " 0 " class =" bodyTable" >
50
+ <table class =" bodyTable" >
51
51
<tr >
52
52
<th >Name</th >
53
53
<th >Type</th >
81
81
</table >
82
82
</subsection >
83
83
<subsection name =" Optional Parameters" >
84
- <table border = " 0 " class =" bodyTable" >
84
+ <table class =" bodyTable" >
85
85
<tr >
86
86
<th >Name</th >
87
87
<th >Type</th >
109
109
<subsection name =" Parameter Details" >
110
110
<h4 >
111
111
<strong >
112
- <a name =" dir" >< dir> </a >
112
+ <a id =" dir" >< dir> </a >
113
113
</strong >
114
114
</h4 >
115
115
<div >Test parameter description</div >
142
142
<hr />
143
143
<h4 >
144
144
<strong >
145
- <a name =" withoutSince" >< withoutSince> </a >
145
+ <a id =" withoutSince" >< withoutSince> </a >
146
146
</strong >
147
147
</h4 >
148
148
<div >(no description)</div >
You can’t perform that action at this time.
0 commit comments