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

- pom.xml: parent org.metricshub:oss-parent 4 -> 5.
- .github/workflows: metricshub/workflows reusable workflows @v3 -> @v7
  (maven-build, maven-central-deploy, maven-central-release). GitHub runners
  now ship Maven 3.10, and Central snapshot deploys need workflows v7, which
  declares the central.sonatype.com origin.
- Site with Doxia 2: maven-site-plugin 4.0.0-M16 with
  org.sentrysoftware.maven: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), and
  src/site/site.xml converted to the SITE 2.0.0 descriptor with
  sentry-maven-skin 8.0.00, same as jflat (MetricsHub/jflat#70).

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                       | 15 ++++++++++++++-
 src/site/site.xml             | 19 +++++++++++--------
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2809d23..ff461dd 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@v3
+    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 86d89bf..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@v3
+    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 436c32a..75ca59c 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@v3
+    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 4d022aa..4a40f5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.metricshub</groupId>
 		<artifactId>oss-parent</artifactId>
-		<version>4</version>
+		<version>5</version>
 	</parent>
 
 	<artifactId>xflat</artifactId>
@@ -106,6 +106,19 @@
 
 	<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 87fa72b..a8eaea9 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>xflat</keywords>
 	</custom>
 
-	<bannerLeft>
-		<src>images/metricshub-logo.png</src>
-		<href>https://metricshub.org</href>
+	<bannerLeft name="MetricsHub" href="https://metricshub.org">
+		<image src="images/metricshub-logo.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>

From 1b16ebb6cf65a89043b68ac750612a7928e59dfe Mon Sep 17 00:00:00 2001
From: Nassim Boutekedjiret <nassim@sentrysoftware.com>
Date: Thu, 8 Oct 2026 20:42:49 +0200
Subject: [PATCH 2/2] Use metricshub/workflows v8

v8 keeps the Resolver local-repository files out of the Central bundle when releasing with Maven 3.10 (MetricsHub/workflows#39). The inputs are unchanged.

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 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff461dd..839621a 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@v7
+    uses: metricshub/workflows/.github/workflows/maven-build.yml@v8
     with:
       jdkVersion: "17"
       debug: ${{ github.event_name == 'workflow_dispatch' && inputs.debug }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 3538b03..29dff8e 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@v7
+    uses: metricshub/workflows/.github/workflows/maven-central-deploy.yml@v8
     with:
       jdkVersion: "17"
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 75ca59c..189e1a9 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@v7
+    uses: metricshub/workflows/.github/workflows/maven-central-release.yml@v8
     with:
       releaseVersion: ${{ inputs.releaseVersion }}
       developmentVersion: ${{ inputs.developmentVersion }}