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/05/26 10:33:18 UTC
(maven-plugin-tools) branch doxia-2.0.0 updated (2b87a21f -> e16d47e6)
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 2b87a21f [MPLUGIN-501] Upgrade to Doxia 2.0.0 Milestone Stack
add b4e736b0 [MPLUGIN-496] Remove orphaned key entries (#260)
add 65cba8f7 Bump org.junit:junit-bom from 5.10.1 to 5.10.2
add 91952b90 Bump org.assertj:assertj-core from 3.25.1 to 3.25.3 (#262)
add df153787 Bump com.thoughtworks.qdox:qdox from 2.0.3 to 2.1.0 (#259)
add 668f6c0d [MPLUGIN-511] move requirement detection code
add b3f427e1 Remove decade+ old content (#265)
add bf0587c5 fix build (#266)
add d9f8d894 [MPLUGIN-511] prepare method to list releases history
add cd747611 [MPLUGIN-511] add versions history requirements detection
add ddbaa5b4 Bump apache/maven-gh-actions-shared from 3 to 4
add 1aad2141 [MPLUGIN-514] switch from png+imagemap to svg
add a9dd57db rename mavenVersion to maven3Version
add d8fecbc1 Bump org.codehaus.plexus:plexus-archiver from 4.9.1 to 4.9.2
add 6f9c3d93 use @Component instead of @Parameter when possible
add e97ba772 [MPLUGIN-510] group history per common requirements
add e5e3dd23 code simplifications
add 0b69acc4 [maven-release-plugin] prepare release maven-plugin-tools-3.12.0
add 9fc1aaae [maven-release-plugin] prepare for next development iteration
add af234c66 [MPLUGIN-516] Bump asmVersion from 9.6 to 9.7 Add additional definitions for JDK 23
add e746d9cc [MPLUGIN-517] GoalRenderer renderParameterDetails() renders in wrong order
add 1fa18050 [MPLUGIN-519][MPLUGIN-520] Parent POM 42, prerequisite of 3.6.3, get rid of maven-compat (#280)
add 789315b6 [MPLUGIN-521] Nested types not properly extracted cause exception while generating Javadoc URLs
add 7a9ba2ad [maven-release-plugin] prepare release maven-plugin-tools-3.13.0
add 993425ca [maven-release-plugin] prepare for next development iteration
new e16d47e6 [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 (2b87a21f)
\
N -- N -- N refs/heads/doxia-2.0.0 (e16d47e6)
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:
.github/workflows/maven-verify.yml | 2 +-
.gitignore | 2 +
maven-plugin-annotations/pom.xml | 2 +-
maven-plugin-plugin/pom.xml | 6 +-
.../annotation-with-inheritance-from-deps/pom.xml | 4 +-
.../it/annotation-with-inheritance-reactor/pom.xml | 4 +-
.../src/it/annotation-with-inheritance/pom.xml | 4 +-
maven-plugin-plugin/src/it/asm-failure/pom.xml | 2 +-
.../help-basic-deprecated-annotation-only/pom.xml | 2 +-
.../src/it/help-basic-jdk11/pom.xml | 2 +-
maven-plugin-plugin/src/it/help-basic/pom.xml | 2 +-
maven-plugin-plugin/src/it/help-package/pom.xml | 2 +-
.../src/it/java-basic-annotations-jdk8/pom.xml | 4 +-
.../it/java-basic-annotations-jdkcurrent/pom.xml | 4 +-
.../src/it/java-basic-annotations/pom.xml | 4 +-
.../src/it/java-basic-annotations/verify.groovy | 2 +-
maven-plugin-plugin/src/it/java-basic/pom.xml | 4 +-
maven-plugin-plugin/src/it/mplugin-223/pom.xml | 2 +-
.../src/it/mplugin-272_java8/pom.xml | 2 +-
.../src/it/mplugin-299_no-configuration/pom.xml | 2 +-
.../it/mplugin-305_defaultMojoDependencies/pom.xml | 2 +-
.../it/mplugin-305_emptyMojoDependencies/pom.xml | 2 +-
.../it/mplugin-305_singleMojoDependencies/pom.xml | 2 +-
.../src/it/mplugin-324_javadoc/pom.xml | 2 +-
.../src/it/mplugin-363_help-reproducible/pom.xml | 2 +-
.../it/mplugin-370-maven-deps-scope-bad/pom.xml | 2 +-
.../it/mplugin-370-maven-deps-scope-good/pom.xml | 2 +-
.../pom.xml | 4 +-
.../pom.xml | 2 +-
maven-plugin-plugin/src/it/mplugin-390/pom.xml | 2 +-
maven-plugin-plugin/src/it/packaging-jar/pom.xml | 2 +-
maven-plugin-plugin/src/it/skip/pom.xml | 2 +-
.../src/it/source-encoding/latin-1/pom.xml | 2 +-
.../src/it/source-encoding/utf-8/pom.xml | 2 +-
.../maven/plugin/plugin/AbstractGeneratorMojo.java | 3 +-
.../plugin/plugin/DescriptorGeneratorMojo.java | 18 +--
.../metadata/AddPluginArtifactMetadataMojo.java | 45 +++---
.../plugin/plugin/metadata/LegacySupport.java | 40 +++++
.../src/site/apt/examples/using-annotations.apt.vm | 9 +-
maven-plugin-report-plugin/pom.xml | 4 +-
.../antsample-maven-plugin/pom.xml | 2 +-
.../javasample-maven-plugin/pom.xml | 2 +-
.../src/it/mplugin-191/pom.xml | 2 +-
.../src/it/mplugin-319_report-since/pom.xml | 2 +-
.../src/it/mplugin-394_report-encoding/pom.xml | 2 +-
.../src/it/plugin-info-jdk-default-version/pom.xml | 2 +-
.../src/it/plugin-info-jdk/pom.xml | 2 +-
.../src/it/plugin-info-jdk/verify.groovy | 2 +-
.../src/it/plugin-report-annotations/pom.xml | 6 +-
.../src/it/plugin-report-annotations/verify.groovy | 2 +-
.../invoker.properties | 0
.../pom.xml | 25 +---
.../src/main/java/org/MyMojo.java | 0
.../verify.groovy | 9 +-
.../it/plugin-report-requirements-history/pom.xml | 2 +-
.../it/plugin-report-with-javadoc-links/pom.xml | 6 +-
.../src/it/plugin-report/pom.xml | 6 +-
.../src/it/plugin-report/verify.groovy | 2 +-
.../maven/plugin/plugin/report/GoalRenderer.java | 4 +-
.../plugin/report/PluginOverviewRenderer.java | 132 ++++-------------
.../maven/plugin/plugin/report/PluginReport.java | 97 ++++++++++++
.../plugin/plugin/report/RequirementsHistory.java | 118 +++++++++++++++
.../src/main/resources/plugin-report.properties | 2 -
maven-plugin-tools-annotations/pom.xml | 2 +-
.../JavaAnnotationsMojoDescriptorExtractor.java | 1 +
maven-plugin-tools-api/pom.xml | 2 +-
.../maven/tools/plugin/util/PluginUtils.java | 17 +--
maven-plugin-tools-generators/pom.xml | 2 +-
.../tools/plugin/generator/GeneratorUtils.java | 9 +-
.../generator/PluginDescriptorFilesGenerator.java | 12 +-
.../PluginDescriptorFilesGeneratorTest.java | 4 +
maven-plugin-tools-java/pom.xml | 2 +-
maven-script/maven-plugin-tools-ant/pom.xml | 4 +-
maven-script/maven-plugin-tools-beanshell/pom.xml | 4 +-
maven-script/maven-plugin-tools-model/pom.xml | 4 +-
maven-script/maven-script-ant/pom.xml | 4 +-
maven-script/maven-script-beanshell/pom.xml | 4 +-
maven-script/pom.xml | 4 +-
pom.xml | 39 +++--
.../test/resources/dir-flag.txt => prepare-svg.sh | 19 ++-
src/site/resources/images/plugin-tools-deps.png | Bin 47339 -> 0 bytes
src/site/resources/images/plugin-tools-deps.svg | 163 +++++++++++++++++++++
src/site/xdoc/index.xml | 53 +------
src/site/xdoc/plugin-tools-deps.odg | Bin 26872 -> 20526 bytes
.../coreit/TestInterface.java => svgo.config.mjs | 28 ++--
85 files changed, 655 insertions(+), 356 deletions(-)
create mode 100644 maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/LegacySupport.java
copy maven-plugin-report-plugin/src/it/{plugin-report-requirements-history => plugin-report-detect-requirements-history}/invoker.properties (100%)
copy maven-plugin-report-plugin/src/it/{plugin-report-requirements-history => plugin-report-detect-requirements-history}/pom.xml (80%)
copy maven-plugin-report-plugin/src/it/{plugin-report-annotations => plugin-report-detect-requirements-history}/src/main/java/org/MyMojo.java (100%)
copy maven-plugin-report-plugin/src/it/{plugin-report-requirements-history => plugin-report-detect-requirements-history}/verify.groovy (79%)
copy maven-plugin-tools-java/src/test/resources/dir-flag.txt => prepare-svg.sh (61%)
mode change 100644 => 100755
delete mode 100644 src/site/resources/images/plugin-tools-deps.png
create mode 100644 src/site/resources/images/plugin-tools-deps.svg
copy maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/TestInterface.java => svgo.config.mjs (69%)
(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 e16d47e63e68a45c816f948d3c147c5ad0a9fe39
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 | 14 +++++++-----
.../src/main/java/org/DummyReport.java | 1 -
.../it/plugin-report-with-javadoc-links/pom.xml | 3 ---
.../src/it/plugin-report/pom.xml | 2 +-
.../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 | 26 +++++-----------------
11 files changed, 23 insertions(+), 42 deletions(-)
diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml
index d023ad27..ff01e6dd 100644
--- a/maven-plugin-report-plugin/pom.xml
+++ b/maven-plugin-report-plugin/pom.xml
@@ -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-M8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-integration-tools</artifactId>
+ <version>2.0.0-M16</version>
</dependency>
<!-- shared -->
@@ -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>
@@ -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-M13</sitePluginVersion>
+ <projectInfoReportsPlugin>4.0.0-M1-SNAPSHOT</projectInfoReportsPlugin>
<antVersion>${antVersion}</antVersion>
</filterProperties>
<properties>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java b/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java
index 66315bcd..1ac5ad70 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report-annotations/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/it/plugin-report-with-javadoc-links/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
index 439d392f..3b1b60b7 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/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
index ae23b489..a666a414 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
@@ -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>
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 c4018aee..a949dc1f 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
@@ -102,7 +102,6 @@ public class DummyReport extends AbstractMavenReport {
/** {@inheritDoc} */
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 5979fe70..baaf8baa 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 e2ca5627..6baaa0ce 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -57,7 +57,7 @@
<!-- other -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
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 b0750122..0786fd44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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-M9</reportingApiVersion>
+ <reportingImplVersion>4.0.0-M13</reportingImplVersion>
<compilerPluginVersion>3.11.0</compilerPluginVersion>
<javadocPluginVersion>3.5.0</javadocPluginVersion>
<project.build.outputTimestamp>2024-05-03T06:48:24Z</project.build.outputTimestamp>
@@ -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>
@@ -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>