You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/08/17 20:36:32 UTC
(maven-plugin-tools) branch doxia-2.0.0 updated (12ab8e02 -> 496131fd)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
omit 12ab8e02 [MPLUGIN-501] Upgrade to Doxia 2.0.0 Milestone Stack
add d134a275 Bump org.assertj:assertj-core from 3.26.0 to 3.26.3
add df153c43 Unify IT config
add c3d379a9 Bump org.codehaus.plexus:plexus-testing from 1.3.0 to 1.4.0
add 6e79fc0a Bump org.codehaus.plexus:plexus-archiver from 4.9.2 to 4.10.0
add e36f367e Bump org.jsoup:jsoup from 1.17.2 to 1.18.1
add a6f66173 [MPLUGIN-529] Add new report goal 'report-no-fork' which will not invoke process-classes
add 9332b09a Directory, not folder
new 496131fd [MPLUGIN-501] Upgrade to Doxia 2.0.0 Milestone Stack
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (12ab8e02)
\
N -- N -- N refs/heads/doxia-2.0.0 (496131fd)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-plugin-report-plugin/pom.xml | 4 +-
.../src/it/fix-maven-since-3.x/invoker.properties | 9 +-
.../src/it/fix-maven-since-3.x/pom.xml | 7 +
.../src/it/mplugin-191/invoker.properties | 6 +-
.../src/it/mplugin-191/pom.xml | 178 +++++++++---------
.../src/it/mplugin-319_report-since/pom.xml | 201 +++++++++++----------
.../mplugin-394_report-encoding/invoker.properties | 7 +-
.../src/it/mplugin-394_report-encoding/pom.xml | 7 +
.../src/it/plugin-info-jdk/pom.xml | 7 +
.../it/plugin-no-fork-report}/invoker.properties | 2 +-
.../pom.xml | 29 ++-
.../src/main/java/org/DummyReport.java | 1 +
.../src/main/java/org/MyMojo.java | 0
.../verify.groovy | 2 +
.../invoker.properties | 6 +-
.../pom.xml | 7 +
.../invoker.properties | 6 +-
.../it/plugin-report-requirements-history/pom.xml | 7 +
.../it/plugin-report-with-javadoc-links/pom.xml | 7 +
.../invoker.properties | 0
.../pom.xml | 7 +
.../src/main/java/org/DummyReport.java | 0
.../src/main/java/org/MyMojo.java | 0
.../verify.groovy | 0
.../plugin/plugin/report/PluginNoForkReport.java | 26 ++-
.../src/site/apt/examples/generate-report.apt.vm | 43 +++++
maven-plugin-report-plugin/src/site/apt/index.apt | 9 +-
.../src/test/resources/plugin-enhanced.xml | 10 +-
pom.xml | 11 +-
29 files changed, 365 insertions(+), 234 deletions(-)
copy {maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad => maven-plugin-report-plugin/src/it/plugin-no-fork-report}/invoker.properties (95%)
copy maven-plugin-report-plugin/src/it/{plugin-report-annotations => plugin-no-fork-report}/pom.xml (84%)
copy maven-plugin-report-plugin/src/it/{plugin-report-annotations => plugin-no-fork-report}/src/main/java/org/DummyReport.java (98%)
copy maven-plugin-report-plugin/src/it/{plugin-report-annotations => plugin-no-fork-report}/src/main/java/org/MyMojo.java (100%)
copy maven-plugin-report-plugin/src/it/{plugin-report-annotations => plugin-no-fork-report}/verify.groovy (95%)
rename maven-plugin-report-plugin/src/it/{plugin-report-annotations => plugin-report}/invoker.properties (100%)
rename maven-plugin-report-plugin/src/it/{plugin-report-annotations => plugin-report}/pom.xml (96%)
rename maven-plugin-report-plugin/src/it/{plugin-report-annotations => plugin-report}/src/main/java/org/DummyReport.java (100%)
rename maven-plugin-report-plugin/src/it/{plugin-report-annotations => plugin-report}/src/main/java/org/MyMojo.java (100%)
rename maven-plugin-report-plugin/src/it/{plugin-report-annotations => plugin-report}/verify.groovy (100%)
copy maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/Execute2Mojo.java => maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginNoForkReport.java (64%)
(maven-plugin-tools) 01/01: [MPLUGIN-501] Upgrade to Doxia 2.0.0 Milestone Stack
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 496131fdd61e2e7718f4adfcc75fe57f7fb6f9e1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 21 18:03:20 2022 +0200
[MPLUGIN-501] Upgrade to Doxia 2.0.0 Milestone Stack
This closes #212
---
maven-plugin-report-plugin/pom.xml | 9 ++++---
.../it/plugin-report-with-javadoc-links/pom.xml | 3 ---
.../src/main/java/org/DummyReport.java | 1 -
.../maven/plugin/plugin/report/GoalRenderer.java | 4 ++--
.../plugin/report/PluginOverviewRenderer.java | 2 +-
.../maven/plugin/plugin/report/PluginReport.java | 2 --
maven-plugin-tools-generators/pom.xml | 2 +-
.../src/test/resources/expected-testGoal-mojo.xml | 8 +++----
pom.xml | 28 +++++-----------------
9 files changed, 18 insertions(+), 41 deletions(-)
diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml
index e1ad2404..73c2cb97 100644
--- a/maven-plugin-report-plugin/pom.xml
+++ b/maven-plugin-report-plugin/pom.xml
@@ -39,7 +39,7 @@
<properties>
<it.debug>true</it.debug>
- <doxiaVersion>1.11.1</doxiaVersion>
+ <doxiaVersion>2.0.0-M12</doxiaVersion>
</properties>
<dependencies>
@@ -120,8 +120,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>
@@ -271,8 +270,8 @@
<settingsFile>src/it/settings.xml</settingsFile>
<streamLogsOnFailures>true</streamLogsOnFailures>
<filterProperties>
- <sitePluginVersion>3.12.1</sitePluginVersion>
- <projectInfoReportsPlugin>3.4.1</projectInfoReportsPlugin>
+ <sitePluginVersion>3.20.0</sitePluginVersion>
+ <projectInfoReportsPlugin>3.7.0</projectInfoReportsPlugin>
</filterProperties>
<properties>
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
index 98beacbf..608f08ca 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
@@ -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>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java b/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
index 66315bcd..1ac5ad70 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
@@ -108,7 +108,6 @@ public class DummyReport extends AbstractMavenReport {
*/
public boolean canGenerateReport() {
if (skip || skipReport) {
- getLog().info("Maven Plugin Plugin Report generation skipped.");
return false;
}
diff --git a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/GoalRenderer.java b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/GoalRenderer.java
index 71a62f10..20d2ea45 100644
--- a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/GoalRenderer.java
+++ b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/GoalRenderer.java
@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
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;
@@ -260,7 +260,7 @@ public class GoalRenderer extends AbstractPluginReportRenderer {
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);
diff --git a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
index d557ed7f..9b810ca1 100644
--- a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
+++ b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
@@ -326,7 +326,7 @@ class PluginOverviewRenderer extends AbstractPluginReportRenderer {
sb.append(" ...").append(Markup.EOL);
sb.append("</project>");
- verbatimText(sb.toString());
+ verbatimSource(sb.toString());
sink.paragraph();
linkPatternedText(getI18nString("configuration.end"));
diff --git a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
index 6c747f4e..a9a0cb3d 100644
--- a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
+++ b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
@@ -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;
}
@@ -273,7 +272,6 @@ public class PluginReport extends AbstractMavenReport {
*/
private void generateMojosDocumentation(PluginDescriptor pluginDescriptor, Locale locale)
throws MavenReportException {
-
if (pluginDescriptor.getMojos() != null) {
for (MojoDescriptor descriptor : pluginDescriptor.getMojos()) {
GoalRenderer renderer;
diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
index 7ac04b6d..e60d81f9 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -83,7 +83,7 @@
<!-- other -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/maven-plugin-tools-generators/src/test/resources/expected-testGoal-mojo.xml b/maven-plugin-tools-generators/src/test/resources/expected-testGoal-mojo.xml
index 331787cb..ced84938 100644
--- a/maven-plugin-tools-generators/src/test/resources/expected-testGoal-mojo.xml
+++ b/maven-plugin-tools-generators/src/test/resources/expected-testGoal-mojo.xml
@@ -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>
@@ -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>
@@ -109,7 +109,7 @@
<subsection name="Parameter Details">
<h4>
<strong>
- <a name="dir"><dir></a>
+ <a id="dir"><dir></a>
</strong>
</h4>
<div>Test parameter description</div>
@@ -142,7 +142,7 @@
<hr/>
<h4>
<strong>
- <a name="withoutSince"><withoutSince></a>
+ <a id="withoutSince"><withoutSince></a>
</strong>
</h4>
<div>(no description)</div>
diff --git a/pom.xml b/pom.xml
index 327fb913..b3ac12c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,10 +101,10 @@
<asmVersion>9.7</asmVersion>
<plexusUtilsVersion>4.0.1</plexusUtilsVersion>
<plexusXmlVersion>3.0.1</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>
+ <javadocPluginVersion>3.9.0</javadocPluginVersion>
<version.maven-invoker-plugin>3.7.0</version.maven-invoker-plugin>
<enforcerPluginVersion>3.5.0</enforcerPluginVersion>
<project.build.outputTimestamp>2024-06-26T07:46:19Z</project.build.outputTimestamp>
@@ -183,12 +183,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>
@@ -220,24 +214,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>