Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MPLUGIN-501] Upgrade to Doxia 2.0.0 Milestone Stack #212

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[MPLUGIN-501] Upgrade to Doxia 2.0.0 Milestone Stack #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions maven-plugin-report-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>1.11.1</version>
<version>2.0.0-M12</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-integration-tools</artifactId>
<version>2.0.0-M19</version>
</dependency>

<!-- shared -->
Expand All @@ -98,8 +103,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<!--same version as used by doxia site renderer -->
<version>3.14.0</version>
</dependency>
<!-- plexus -->
<dependency>
Expand Down Expand Up @@ -250,8 +254,8 @@
<settingsFile>src/it/settings.xml</settingsFile>
<streamLogsOnFailures>true</streamLogsOnFailures>
<filterProperties>
<sitePluginVersion>3.12.1</sitePluginVersion>
<projectInfoReportsPlugin>3.4.1</projectInfoReportsPlugin>
<sitePluginVersion>4.0.0-M15-SNAPSHOT</sitePluginVersion>
<projectInfoReportsPlugin>4.0.0-M1-SNAPSHOT</projectInfoReportsPlugin>
<antVersion>${antVersion}</antVersion>
</filterProperties>
<properties>
Expand Down
1 change: 0 additions & 1 deletion ...-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ protected MavenProject getProject() {
*/
public boolean canGenerateReport() {
if (skip || skipReport) {
getLog().info("Maven Plugin Plugin Report generation skipped.");
return false;
}

Expand Down
3 changes: 0 additions & 3 deletions maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@sitePluginVersion@</version>
<configuration>
<locales>en</locales>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-report-plugin/src/it/plugin-report/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ under the License.
<artifactId>maven-site-plugin</artifactId>
<version>@sitePluginVersion@</version>
<configuration>
<locales>en,de,fr</locales>
<locales>default,de,fr</locales>
</configuration>
</plugin>
</plugins>
Expand Down
1 change: 0 additions & 1 deletion maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ protected MavenProject getProject() {
/** {@inheritDoc} */
public boolean canGenerateReport() {
if (skip || skipReport) {
getLog().info("Maven Plugin Plugin Report generation skipped.");
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions ...lugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/GoalRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet.Semantics;
import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.logging.Log;
Expand Down Expand Up @@ -260,7 +260,7 @@ private void renderParameterOverviewTableRow(Parameter parameter) {
renderTableCellWithCode(
format("parameter.name", parameter.getName()),
// no need for additional URI encoding as it returns only URI safe characters
Optional.of("#" + HtmlTools.encodeId(parameter.getName())));
Optional.of("#" + DoxiaUtils.encodeId(parameter.getName())));

// type
Map.Entry<String, Optional<String>> type = getLinkedType(parameter, true);
Expand Down
2 changes: 1 addition & 1 deletion ...rt-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ private void renderUsageSection(boolean hasMavenReport) {
sb.append(" ...").append(Markup.EOL);
sb.append("</project>");

verbatimText(sb.toString());
verbatimSource(sb.toString());

sink.paragraph();
linkPatternedText(getI18nString("configuration.end"));
Expand Down
2 changes: 0 additions & 2 deletions ...lugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ public class PluginReport extends AbstractMavenReport {
@Override
public boolean canGenerateReport() {
if (skip) {
getLog().info("Maven Plugin Plugin Report generation skipped.");
return false;
}

Expand Down Expand Up @@ -273,7 +272,6 @@ public String getOutputName() {
*/
private void generateMojosDocumentation(PluginDescriptor pluginDescriptor, Locale locale)
throws MavenReportException {

if (pluginDescriptor.getMojos() != null) {
for (MojoDescriptor descriptor : pluginDescriptor.getMojos()) {
GoalRenderer renderer;
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-tools-generators/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<!-- other -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<artifactId>velocity-engine-core</artifactId>
</dependency>

<dependency>
Expand Down
8 changes: 4 additions & 4 deletions maven-plugin-tools-generators/src/test/resources/expected-testGoal-mojo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</li>
</ul>
<subsection name="Required Parameters">
<table border="0" class="bodyTable">
<table class="bodyTable">
<tr>
<th>Name</th>
<th>Type</th>
Expand Down Expand Up @@ -81,7 +81,7 @@
</table>
</subsection>
<subsection name="Optional Parameters">
<table border="0" class="bodyTable">
<table class="bodyTable">
<tr>
<th>Name</th>
<th>Type</th>
Expand Down Expand Up @@ -109,7 +109,7 @@
<subsection name="Parameter Details">
<h4>
<strong>
<a name="dir">&lt;dir&gt;</a>
<a id="dir">&lt;dir&gt;</a>
</strong>
</h4>
<div>Test parameter description</div>
Expand Down Expand Up @@ -142,7 +142,7 @@
<hr/>
<h4>
<strong>
<a name="withoutSince">&lt;withoutSince&gt;</a>
<a id="withoutSince">&lt;withoutSince&gt;</a>
</strong>
</h4>
<div>(no description)</div>
Expand Down
26 changes: 5 additions & 21 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@
<asmVersion>9.7</asmVersion>
<plexusUtilsVersion>4.0.1</plexusUtilsVersion>
<plexusXmlVersion>3.0.0</plexusXmlVersion>
<reportingApiVersion>3.1.1</reportingApiVersion>
<reportingImplVersion>3.2.0</reportingImplVersion>
<reportingApiVersion>4.0.0-M12</reportingApiVersion>
<reportingImplVersion>4.0.0-M15</reportingImplVersion>
<compilerPluginVersion>3.11.0</compilerPluginVersion>
<javadocPluginVersion>3.5.0</javadocPluginVersion>
<project.build.outputTimestamp>2024-05-03T06:48:24Z</project.build.outputTimestamp>
Expand Down Expand Up @@ -193,12 +193,6 @@
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>${reportingImplVersion}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -230,24 +224,14 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.2</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
<exclusion>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
</exclusion>
</exclusions>
<version>2.1.0</version>
</dependency>

<!-- other -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.7</version>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>

<dependency>
Expand Down