From ae39e5fdc608387eccac7bb2c76b771f20607391 Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Tue, 19 Nov 2024 11:19:55 +0100
Subject: [PATCH 1/3] Let's try

---
 pom.xml | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6811ab82..5bc16b43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,8 +193,10 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <javaVersion>8</javaVersion>
-    <mavenVersion>3.6.3</mavenVersion>
+    <javaVersion>17</javaVersion>
+    <mavenVersion>4.0.0-beta-5</mavenVersion>
+    <sisuVersion>0.9.0.M3</sisuVersion>
+    <guiceVersion>6.0.0</guiceVersion>
     <!-- for dependencies -->
     <jettyVersion>9.4.57.v20241219</jettyVersion>
     <doxiaVersion>2.0.0</doxiaVersion>
@@ -228,6 +230,16 @@ under the License.
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-exec</artifactId>
       <version>2.0.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.maven.resolver</groupId>
+          <artifactId>maven-resolver-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.maven.resolver</groupId>
+          <artifactId>maven-resolver-util</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -246,7 +258,7 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
       <version>${mavenVersion}</version>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -296,6 +308,13 @@ under the License.
       <version>2.20.0</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.inject</artifactId>
+      <version>${sisuVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- dependencies to annotations -->
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -315,6 +334,12 @@ under the License.
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.plexus</artifactId>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.sonatype.sisu</groupId>
+          <artifactId>sisu-guice</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -501,6 +526,13 @@ under the License.
     </dependency>
 
     <!-- test -->
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>${guiceVersion}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>

From 31c16062108ba8077d6e4ca3ce7613fbeb430cf6 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 19 Nov 2024 16:57:13 +0100
Subject: [PATCH 2/3] Use latest harness

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5bc16b43..425e17e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -536,7 +536,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 9293741fae922c1267156cf9d754d2e781a00949 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Sun, 19 Oct 2025 18:47:24 +0200
Subject: [PATCH 3/3] Switch to Maven 4.0.0-rc4

---
 .github/workflows/maven-verify.yml |  2 ++
 pom.xml                            | 29 ++++++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 932827cf..c39f0942 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -25,3 +25,5 @@ jobs:
   build:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
+    with:
+      maven4-build: true
diff --git a/pom.xml b/pom.xml
index 425e17e4..3a438644 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,27 +194,27 @@ under the License.
 
   <properties>
     <javaVersion>17</javaVersion>
-    <mavenVersion>4.0.0-beta-5</mavenVersion>
-    <sisuVersion>0.9.0.M3</sisuVersion>
-    <guiceVersion>6.0.0</guiceVersion>
+    <mavenVersion>4.0.0-rc-4</mavenVersion>
+    <sisuVersion>0.9.0.M4</sisuVersion>
+    <guiceVersion>5.1.0</guiceVersion>
     <!-- for dependencies -->
     <jettyVersion>9.4.57.v20241219</jettyVersion>
     <doxiaVersion>2.0.0</doxiaVersion>
     <doxiaSitetoolsVersion>2.0.0</doxiaSitetoolsVersion>
     <wagonVersion>3.5.3</wagonVersion>
-    <slf4jVersion>1.7.36</slf4jVersion>
+    <slf4jVersion>2.0.17</slf4jVersion>
     <!-- for ITs -->
     <checkstylePluginVersion>3.5.0</checkstylePluginVersion>
     <javadocPluginVersion>3.10.1</javadocPluginVersion>
     <pmdPluginVersion>3.25.0</pmdPluginVersion>
     <jxrPluginVersion>3.5.0</jxrPluginVersion>
-    <projectInfoReportsPluginVersion>3.7.0</projectInfoReportsPluginVersion>
+    <projectInfoReportsPluginVersion>3.9.0</projectInfoReportsPluginVersion>
     <surefirePluginVersion>3.5.1</surefirePluginVersion>
     <mavenPluginPluginVersion>3.15.0</mavenPluginPluginVersion>
     <taglistPluginVersion>3.2.1</taglistPluginVersion>
     <antrunPluginVersion>3.1.0</antrunPluginVersion>
     <mavenReportingImplVersion>4.0.0</mavenReportingImplVersion>
-    <fluidoSkinVersion>2.0.0-M11</fluidoSkinVersion>
+    <fluidoSkinVersion>2.1.0</fluidoSkinVersion>
     <project.build.outputTimestamp>2024-07-17T13:43:56Z</project.build.outputTimestamp>
     <!-- remove with parent pom upgrade -->
     <version.maven-invoker-plugin>3.9.1</version.maven-invoker-plugin>
@@ -351,12 +351,6 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-i18n</artifactId>
       <version>1.0.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-component-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -536,9 +530,18 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>3.4.0-SNAPSHOT</version>
+      <version>3.3.0</version>
       <scope>test</scope>
     </dependency>
+    <!--
+      <dependency>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-testing</artifactId>
+          <version>${mavenVersion}</version>
+          <scope>test</scope>
+      </dependency>
+
+-->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>