From e632bcceb5b82b2f30f94474be8f122197abbbbf Mon Sep 17 00:00:00 2001
From: Nassim Boutekedjiret <nassim@sentrysoftware.com>
Date: Thu, 8 Oct 2026 18:25:55 +0200
Subject: [PATCH] Update metricshub/workflows to v7 and the site to Doxia 2

- .github/workflows: maven-build, maven-central-deploy and
  maven-central-release reusable workflows from v5 to v7. GitHub runners
  now ship Maven 3.10, and Central snapshot deploys need workflows v7,
  which declares the central.sonatype.com origin.
- pom.xml: maven-site-plugin 4.0.0-M16 with maven-skin-tools 1.8.01.
  maven-site-plugin 3.12.1 (from oss-parent) mixes Velocity 1.7 and 2.x
  and fails with Maven 3.10 (AbstractMethodError on
  org.apache.velocity.tools.ToolContext).
- src/site/site.xml: converted to the SITE 2.0.0 descriptor (UTF-8,
  sentry-maven-skin 8.0.00, bannerLeft with an image child, numeric
  character reference for the registered sign), same as jflat.

oss-parent is already 5.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .github/workflows/build.yml   |  2 +-
 .github/workflows/deploy.yml  |  2 +-
 .github/workflows/release.yml |  2 +-
 pom.xml                       | 14 ++++++++++++++
 src/site/site.xml             | 19 +++++++++++--------
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb86daf..2345754 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   build:
-    uses: metricshub/workflows/.github/workflows/maven-build.yml@v5
+    uses: metricshub/workflows/.github/workflows/maven-build.yml@v7
     with:
       jdkVersion: "17"
       debug: ${{ github.event_name == 'workflow_dispatch' && inputs.debug }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 52307a5..3538b03 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   deploy:
-    uses: metricshub/workflows/.github/workflows/maven-central-deploy.yml@v5
+    uses: metricshub/workflows/.github/workflows/maven-central-deploy.yml@v7
     with:
       jdkVersion: "17"
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 47ed758..ee9a68d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   release:
-    uses: metricshub/workflows/.github/workflows/maven-central-release.yml@v5
+    uses: metricshub/workflows/.github/workflows/maven-central-release.yml@v7
     with:
       releaseVersion: ${{ inputs.releaseVersion }}
       developmentVersion: ${{ inputs.developmentVersion }}
diff --git a/pom.xml b/pom.xml
index 8c29a9a..3551bd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,20 @@
 	<build>
 		<plugins>
 
+			<!-- Site with Doxia 2: maven-site-plugin 3.12.1 (from oss-parent) mixes two Velocity generations, which -->
+			<!-- fails with Maven 3.10 (AbstractMethodError on org.apache.velocity.tools.ToolContext) -->
+			<plugin>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>4.0.0-M16</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.sentrysoftware.maven</groupId>
+						<artifactId>maven-skin-tools</artifactId>
+						<version>1.8.01</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
 			<!-- Prettier -->
 			<plugin>
 				<groupId>com.hubspot.maven.plugins</groupId>
diff --git a/src/site/site.xml b/src/site/site.xml
index 3f61bd5..ba69bb4 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,10 +1,14 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="${project.name}">
+<?xml version="1.0" encoding="UTF-8"?>
+<site
+	xmlns="http://maven.apache.org/SITE/2.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
+	name="${project.name}">
 
 	<skin>
 		<groupId>org.sentrysoftware.maven</groupId>
 		<artifactId>sentry-maven-skin</artifactId>
-		<version>6.4.01</version>
+		<version>8.0.00</version>
 	</skin>
 
 	<custom>
@@ -12,16 +16,15 @@
 		<keywords>ssh</keywords>
 	</custom>
 
-	<bannerLeft>
-		<src>images/metricshub-logo-only.png</src>
-		<href>https://metricsHub.org</href>
+	<bannerLeft name="MetricsHub" href="https://metricsHub.org">
+		<image src="images/metricshub-logo-only.png" />
 	</bannerLeft>
 
 	<body>
 
 		<links>
 			<item name="Fork on GitHub" href="${project.scm.url}" />
-			<item name="MetricsHub&reg;" href="https://metricshub.com" />
+			<item name="MetricsHub&#174;" href="https://metricshub.com" />
 		</links>
 
 		<menu name="User Documentation">
@@ -32,4 +35,4 @@
 		<menu ref="reports" />
 	</body>
 
-</project>
\ No newline at end of file
+</site>