From c6cf015dee4010394bd32f6f294945d47a47a1bd Mon Sep 17 00:00:00 2001
From: Abel Salgado Romero <abelromero@gmail.com>
Date: Sun, 3 Nov 2024 10:54:49 +0100
Subject: [PATCH] Set up Maven 4 test pipeline

---
 .github/workflows/build-maven-4.yaml | 43 ++++++++++++++++++++++++++++
 asciidoctor-maven-commons/pom.xml    | 18 +++++++-----
 2 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/build-maven-4.yaml

diff --git a/.github/workflows/build-maven-4.yaml b/.github/workflows/build-maven-4.yaml
new file mode 100644
index 00000000..c86d2339
--- /dev/null
+++ b/.github/workflows/build-maven-4.yaml
@@ -0,0 +1,43 @@
+name: Build
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '*.adoc'
+      - docs/**
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - '*.adoc'
+      - docs/**
+
+jobs:
+  build:
+    name: Build Maven 4
+    strategy:
+      fail-fast: false
+      max-parallel: 12
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+        java:
+          - 17
+          - 21
+        maven:
+          - 4.0.0-beta-5
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: s4u/setup-maven-action@v1.15.0
+        with:
+          java-distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+          maven-version: ${{ matrix.maven }}
+      - name: Maven version
+        run: mvn -version
+      - name: Build & Test
+        run: mvn -B -Prun-its clean verify -Dmaven.version=${{ matrix.maven }} -Dplexus-utils.version=4.0.2
+
diff --git a/asciidoctor-maven-commons/pom.xml b/asciidoctor-maven-commons/pom.xml
index 3c427e21..d41012c6 100644
--- a/asciidoctor-maven-commons/pom.xml
+++ b/asciidoctor-maven-commons/pom.xml
@@ -21,6 +21,10 @@
     </description>
     <url>https://github.com/asciidoctor/asciidoctor-maven-plugin</url>
 
+    <properties>
+        <plexus-utils.version>3.5.1</plexus-utils.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.asciidoctor</groupId>
@@ -36,20 +40,20 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>3.5.1</version>
+            <version>${plexus-utils.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-sink-api</artifactId>
-            <version>2.0.0</version>
-            <scope>provided</scope>
+            <artifactId>doxia-core</artifactId>
+            <version>${doxia.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-core</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
+            <artifactId>doxia-sink-api</artifactId>
+            <version>${doxia.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>