Skip to content

Commit e632bcc

Browse files
NassimBtkclaude
andcommitted
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 <[email protected]>
1 parent 9517e13 commit e632bcc

5 files changed

Lines changed: 28 additions & 11 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818

1919
jobs:
2020
build:
21-
uses: metricshub/workflows/.github/workflows/maven-build.yml@v5
21+
uses: metricshub/workflows/.github/workflows/maven-build.yml@v7
2222
with:
2323
jdkVersion: "17"
2424
debug: ${{ github.event_name == 'workflow_dispatch' && inputs.debug }}

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
deploy:
13-
uses: metricshub/workflows/.github/workflows/maven-central-deploy.yml@v5
13+
uses: metricshub/workflows/.github/workflows/maven-central-deploy.yml@v7
1414
with:
1515
jdkVersion: "17"
1616
secrets: inherit

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818

1919
jobs:
2020
release:
21-
uses: metricshub/workflows/.github/workflows/maven-central-release.yml@v5
21+
uses: metricshub/workflows/.github/workflows/maven-central-release.yml@v7
2222
with:
2323
releaseVersion: ${{ inputs.releaseVersion }}
2424
developmentVersion: ${{ inputs.developmentVersion }}

‎pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,20 @@
126126
<build>
127127
<plugins>
128128

129+
<!-- Site with Doxia 2: maven-site-plugin 3.12.1 (from oss-parent) mixes two Velocity generations, which -->
130+
<!-- fails with Maven 3.10 (AbstractMethodError on org.apache.velocity.tools.ToolContext) -->
131+
<plugin>
132+
<artifactId>maven-site-plugin</artifactId>
133+
<version>4.0.0-M16</version>
134+
<dependencies>
135+
<dependency>
136+
<groupId>org.sentrysoftware.maven</groupId>
137+
<artifactId>maven-skin-tools</artifactId>
138+
<version>1.8.01</version>
139+
</dependency>
140+
</dependencies>
141+
</plugin>
142+
129143
<!-- Prettier -->
130144
<plugin>
131145
<groupId>com.hubspot.maven.plugins</groupId>

‎src/site/site.xml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1-
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<project name="${project.name}">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<site
3+
xmlns="http://maven.apache.org/SITE/2.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
6+
name="${project.name}">
37

48
<skin>
59
<groupId>org.sentrysoftware.maven</groupId>
610
<artifactId>sentry-maven-skin</artifactId>
7-
<version>6.4.01</version>
11+
<version>8.0.00</version>
812
</skin>
913

1014
<custom>
1115
<noDefaultLinks>true</noDefaultLinks>
1216
<keywords>ssh</keywords>
1317
</custom>
1418

15-
<bannerLeft>
16-
<src>images/metricshub-logo-only.png</src>
17-
<href>https://metricsHub.org</href>
19+
<bannerLeft name="MetricsHub" href="https://metricsHub.org">
20+
<image src="images/metricshub-logo-only.png" />
1821
</bannerLeft>
1922

2023
<body>
2124

2225
<links>
2326
<item name="Fork on GitHub" href="${project.scm.url}" />
24-
<item name="MetricsHub&reg;" href="https://metricshub.com" />
27+
<item name="MetricsHub&#174;" href="https://metricshub.com" />
2528
</links>
2629

2730
<menu name="User Documentation">
@@ -32,4 +35,4 @@
3235
<menu ref="reports" />
3336
</body>
3437

35-
</project>
38+
</site>

0 commit comments

Comments
 (0)