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 2022/07/19 12:33:36 UTC
[maven-plugin-tools] branch prepare-for-doxia-2 updated (03201747 -> 755304bf)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch prepare-for-doxia-2
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
omit 03201747 Prepare for Doxia (Sitetools) 2.0.0
add 4955a6a0 Bump plexus-utils to 3.4.2
add e896387c [MPLUGIN-407] Remove duplicate code from PluginReport
add b5d28ae4 [MPLUGIN-406] Deprecate requirements parameter in report Mojo
add b8fd4c92 Use plexusUtilsVersion property in IT test
new 755304bf [MPLUGIN-409] Prepare for Doxia (Sitetools) 2.0.0
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 (03201747)
\
N -- N -- N refs/heads/prepare-for-doxia-2 (755304bf)
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:
.../annotation-with-inheritance-from-deps/pom.xml | 2 +-
.../src/it/annotation-with-inheritance/pom.xml | 2 +-
.../src/it/fix-maven-since-3.x/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 | 2 +-
.../it/java-basic-annotations-jdkcurrent/pom.xml | 2 +-
.../src/it/java-basic-annotations/pom.xml | 2 +-
.../src/it/mplugin-299_no-configuration/pom.xml | 2 +-
.../src/it/mplugin-324_javadoc/pom.xml | 2 +-
.../src/it/mplugin-363_help-reproducible/pom.xml | 2 +-
.../pom.xml | 2 +-
.../src/it/mplugin-394_report-encoding/pom.xml | 2 +-
maven-plugin-plugin/src/it/packaging-jar/pom.xml | 2 +-
.../apache/maven/plugin/plugin/PluginReport.java | 136 +++------------------
pom.xml | 3 +-
17 files changed, 32 insertions(+), 137 deletions(-)
[maven-plugin-tools] 01/01: [MPLUGIN-409] Prepare for Doxia (Sitetools) 2.0.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch prepare-for-doxia-2
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 755304bf3b44f5e83e134b7b8196e4569d2b8344
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jul 18 22:05:30 2022 +0200
[MPLUGIN-409] Prepare for Doxia (Sitetools) 2.0.0
* Simplify Velocity context setup
* Add/fix missing elements in site descriptors
* Upgrade Maven Project Reports Plugin to 3.4.0 for ITs
This closes #123
---
maven-plugin-plugin/pom.xml | 2 +-
.../antsample-maven-plugin/src/site/site.xml | 7 ++++++-
.../javasample-maven-plugin/src/site/site.xml | 7 ++++++-
.../maven/tools/plugin/generator/PluginHelpGenerator.java | 15 +++++++--------
4 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 47f849fc..60f762c4 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -327,7 +327,7 @@
<streamLogsOnFailures>true</streamLogsOnFailures>
<filterProperties>
<sitePluginVersion>3.11.0</sitePluginVersion>
- <projectInfoReportsPlugin>3.2.2</projectInfoReportsPlugin>
+ <projectInfoReportsPlugin>3.4.0</projectInfoReportsPlugin>
<antVersion>${antVersion}</antVersion>
</filterProperties>
<properties>
diff --git a/maven-plugin-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/site/site.xml b/maven-plugin-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/site/site.xml
index fc47fd70..e4ac0af4 100644
--- a/maven-plugin-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/site/site.xml
+++ b/maven-plugin-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/site/site.xml
@@ -20,6 +20,11 @@
<project name="${artifactId}">
<publishDate position="right" format="dd/MM/yyyy, HH:mm" />
<version position="right"/>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.11.1</version>
+ </skin>
<poweredBy>
<logo name="Maven" href="http://maven.apache.org/"
img="${project.url}/images/maven-feather.png" />
@@ -31,6 +36,6 @@
<item name="Usage" href="usage.html"/>
<item name="FAQ" href="faq.html"/>
</menu>
- ${reports}
+ <menu ref="reports" />
</body>
</project>
diff --git a/maven-plugin-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/src/site/site.xml b/maven-plugin-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/src/site/site.xml
index 45203145..8f287660 100644
--- a/maven-plugin-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/src/site/site.xml
+++ b/maven-plugin-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/src/site/site.xml
@@ -20,6 +20,11 @@
<project name="${artifactId}">
<publishDate position="right" format="dd/MM/yyyy, HH:mm" />
<version position="right"/>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.11.1</version>
+ </skin>
<poweredBy>
<logo name="Maven" href="http://maven.apache.org/"
img="${project.url}/images/maven-feather.png" />
@@ -31,7 +36,7 @@
<item name="Usage" href="usage.html"/>
<item name="FAQ" href="faq.html"/>
</menu>
- ${reports}
+ <menu ref="reports" />
</body>
</project>
diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
index 2c3af589..d430e5a0 100644
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
@@ -184,20 +184,19 @@ public class PluginHelpGenerator
private String getHelpClassSources( String pluginHelpPath, PluginDescriptor pluginDescriptor )
throws IOException
{
- Properties properties = new Properties();
- VelocityContext context = new VelocityContext( properties );
+ VelocityContext context = new VelocityContext();
if ( this.helpPackageName != null )
{
- properties.put( "helpPackageName", this.helpPackageName );
+ context.put( "helpPackageName", this.helpPackageName );
}
else
{
- properties.put( "helpPackageName", "" );
+ context.put( "helpPackageName", "" );
}
- properties.put( "pluginHelpPath", pluginHelpPath );
- properties.put( "artifactId", pluginDescriptor.getArtifactId() );
- properties.put( "goalPrefix", pluginDescriptor.getGoalPrefix() );
- properties.put( "useAnnotations", useAnnotations );
+ context.put( "pluginHelpPath", pluginHelpPath );
+ context.put( "artifactId", pluginDescriptor.getArtifactId() );
+ context.put( "goalPrefix", pluginDescriptor.getGoalPrefix() );
+ context.put( "useAnnotations", useAnnotations );
StringWriter stringWriter = new StringWriter();