Skip to content

Update oss-parent to 5, metricshub/workflows to v8 and the site to Doxia 2 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NassimBtk merged 2 commits into from
Oct 9, 2026
Merged

Update oss-parent to 5, metricshub/workflows to v8 and the site to Doxia 2 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15e8872
Update oss-parent to 5, metricshub/workflows to v7 and the site to Do…
NassimBtk Oct 8, 2026
3d099f0
Use metricshub/workflows v8
NassimBtk Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

jobs:
build:
uses: metricshub/workflows/.github/workflows/maven-build.yml@v6
uses: metricshub/workflows/.github/workflows/maven-build.yml@v8
with:
jdkVersion: "17"
debug: ${{ github.event_name == 'workflow_dispatch' && inputs.debug }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
deploy:
uses: metricshub/workflows/.github/workflows/maven-central-deploy.yml@v6
uses: metricshub/workflows/.github/workflows/maven-central-deploy.yml@v8
with:
jdkVersion: "17"
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

jobs:
release:
uses: metricshub/workflows/.github/workflows/maven-central-release.yml@v6
uses: metricshub/workflows/.github/workflows/maven-central-release.yml@v8
with:
releaseVersion: ${{ inputs.releaseVersion }}
developmentVersion: ${{ inputs.developmentVersion }}
Expand Down
20 changes: 19 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.metricshub</groupId>
<artifactId>oss-parent</artifactId>
<version>4</version>
<version>5</version>
</parent>

<groupId>org.metricshub</groupId>
Expand Down Expand Up @@ -126,6 +126,24 @@
</plugins>
</pluginManagement>

<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>

</plugins>

</build>

<reporting>
Expand Down
19 changes: 11 additions & 8 deletions src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
<?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>
<noDefaultLinks>true</noDefaultLinks>
<keywords>wbem</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">
Expand All @@ -32,4 +35,4 @@
<menu ref="reports" />
</body>

</project>
</site>
Loading