This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 55ebd9fb Upgrade to Doxia 2.1.0
55ebd9fb is described below
commit 55ebd9fb33a76b2f3aaf81dfdf4e8475bb3e4b4b
Author: Konrad Windszus <[email protected]>
AuthorDate: Fri Apr 24 10:02:10 2026 +0200
Upgrade to Doxia 2.1.0
Upgrade to Reporting Exec 2.0.1
Upgrade IT to maven-changes-plugin 3.0 due to
https://github.com/apache/maven-doxia/issues/1054 and
https://github.com/apache/maven-reporting-exec/issues/141.
---
pom.xml | 4 +--
src/it/projects/report-changes-generation/pom.xml | 2 +-
.../src/changes/changes.xml | 29 ++++++----------------
.../projects/report-changes-generation/verify.bsh | 14 +++--------
4 files changed, 13 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index 427c2f46..a34758b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,7 @@ under the License.
<mavenVersion>3.6.3</mavenVersion>
<!-- for dependencies -->
<jettyVersion>9.4.58.v20250814</jettyVersion>
- <doxiaVersion>2.0.0</doxiaVersion>
+ <doxiaVersion>2.1.0</doxiaVersion>
<doxiaSitetoolsVersion>2.1.0</doxiaSitetoolsVersion>
<wagonVersion>3.5.3</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
@@ -220,7 +220,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-exec</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
diff --git a/src/it/projects/report-changes-generation/pom.xml
b/src/it/projects/report-changes-generation/pom.xml
index aaf956a4..50b9cacc 100644
--- a/src/it/projects/report-changes-generation/pom.xml
+++ b/src/it/projects/report-changes-generation/pom.xml
@@ -47,7 +47,7 @@
</issueManagement>
<properties>
- <changesPluginVersion>2.12.1</changesPluginVersion>
+ <changesPluginVersion>3.0.0-M3</changesPluginVersion>
</properties>
<build>
diff --git a/src/it/projects/report-changes-generation/src/changes/changes.xml
b/src/it/projects/report-changes-generation/src/changes/changes.xml
index b09bbee4..5a3f838d 100644
--- a/src/it/projects/report-changes-generation/src/changes/changes.xml
+++ b/src/it/projects/report-changes-generation/src/changes/changes.xml
@@ -17,9 +17,9 @@ specific language governing permissions and limitations
under the License.
-->
-<document xmlns="http://maven.apache.org/changes/1.0.0";
+<document xmlns="http://maven.apache.org/changes/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/changes/1.0.0
http://maven.apache.org/xsd/changes-1.0.0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/changes/2.0.0
http://maven.apache.org/xsd/changes-2.0.0.xsd";>
<properties>
<title>Changes report Project</title>
<author email="[email protected]">Mr Zloug</author>
@@ -32,33 +32,18 @@ under the License.
<action dev="me" type="fix" issue="MCHANGES-88">
Enable retrieving component-specific issues.
</action>
- <action dev="jruiz" type="remove">
+ <action dev="me" type="fix" issue="1212" system="qc">
+ Enable retrieving component-specific issues.
+ </action>
+ <action dev="jruiz" type="remove" due-to="others"
due-to-email="[email protected]">
The element type " link " must be terminated by the matching end-tag.
Deleted the erroneous code.
- <fixes issue="MCHANGES-1"/>
- <fixes issue="JIRA-12"/>
- <dueto name="John Doe" email="[email protected]"/>
- <dueto name="Jane Doe"/>
- </action>
- <action dev="you" type="update" system="bugzilla">
- Handle different issue systems.
- <fixes issue="BUG-12345"/>
- <dueto name="John Doe" email="[email protected]"/>
- </action>
- <action dev="him" type="update">
- Updated dependencies.
- <dueto name="John Doe" email="[email protected]"/>
- <dueto name="Jane Doe"/>
</action>
</release>
<release version="1.0" date="2005-01-01" description="First release">
- <action dev="me" type="update" issue="MCHANGES-47" due-to="others"
due-to-email="[email protected]">
+ <action dev="me" type="update" date="2008-01-01">
Uploaded documentation on how to use the plugin.
- <fixes issue="MCHANGES-88"/>
- <fixes issue="JIRA-YYY"/>
- <dueto name="John Doe" email="[email protected]"/>
- <dueto name="Jane Doe"/>
</action>
</release>
</body>
diff --git a/src/it/projects/report-changes-generation/verify.bsh
b/src/it/projects/report-changes-generation/verify.bsh
index 27bbd103..e2a56ac9 100644
--- a/src/it/projects/report-changes-generation/verify.bsh
+++ b/src/it/projects/report-changes-generation/verify.bsh
@@ -27,7 +27,7 @@ boolean result = true;
try
{
- File report = new File( basedir, "target/site/changes-report.html" );
+ File report = new File( basedir, "target/site/changes.html" );
if ( !report.exists() || report.isDirectory() )
{
System.err.println( "report file is missing or a directory." );
@@ -38,22 +38,14 @@ try
int indexOf = reportContent.indexOf( "Changes" );
if ( indexOf < 0 )
{
- System.err.println( "changes-report.html doesn't contains Changes Report
title" );
+ System.err.println( "changes.html doesn't contains Changes Report title"
);
return false;
}
indexOf = reportContent.indexOf( "href=\"http://localhost/MCHANGES-88\""; );
if ( indexOf < 0 )
{
- System.err.println( "changes-report.html doesn't contains jira issue
link" );
- return false;
- }
-
- // Tests output problems caused by only using <fixes> element
- indexOf = reportContent.indexOf( "BUG-12345" );
- if ( indexOf < 0 )
- {
- System.err.println( "changes-report.html doesn't contains issue text for
issue specified with <fixes> element" );
+ System.err.println( "changes.html doesn't contains jira issue link" );
return false;
}
}
