From db5786813675e8ac7545f15ba26d43461d4de6b0 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 10 Sep 2024 11:49:23 +0200
Subject: [PATCH 1/5] Upgrade to Maven 4.0.0-beta-4 (wip)

---
 pom.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index fd233d52..09212678 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,13 +72,13 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <mavenVersion>4.0.0-beta-3</mavenVersion>
+    <mavenVersion>4.0.0-beta-4</mavenVersion>
     <javaVersion>17</javaVersion>
 
     <guiceVersion>6.0.0</guiceVersion>
     <mavenFilteringVersion>4.0.0-beta-1</mavenFilteringVersion>
     <mavenPluginPluginVersion>4.0.0-beta-1</mavenPluginPluginVersion>
-    <mavenPluginTestingVersion>4.0.0-beta-1</mavenPluginTestingVersion>
+    <mavenPluginTestingVersion>4.0.0-beta-2-SNAPSHOT</mavenPluginTestingVersion>
     <plexusBuildApiVersion>0.0.7</plexusBuildApiVersion>
     <sisuVersion>0.9.0.M2</sisuVersion>
     <slf4jVersion>2.0.13</slf4jVersion>
@@ -149,7 +149,6 @@ under the License.
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.plexus</artifactId>
       <version>${sisuVersion}</version>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -239,6 +238,20 @@ under the License.
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <configuration>
+          <rules>
+            <enforceBytecodeVersion>
+              <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+              <excludes>
+                <exclude>org.jline:jline</exclude>
+              </excludes>
+            </enforceBytecodeVersion>
+          </rules>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

From 9918ea1c6998d615bc16acb930da799f81811da8 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Thu, 12 Sep 2024 07:02:49 +0200
Subject: [PATCH 2/5] Upgrade to beta-5

---
 pom.xml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 09212678..0964c208 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <mavenVersion>4.0.0-beta-4</mavenVersion>
+    <mavenVersion>4.0.0-beta-5-SNAPSHOT</mavenVersion>
     <javaVersion>17</javaVersion>
 
     <guiceVersion>6.0.0</guiceVersion>
@@ -238,20 +238,6 @@ under the License.
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <configuration>
-          <rules>
-            <enforceBytecodeVersion>
-              <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
-              <excludes>
-                <exclude>org.jline:jline</exclude>
-              </excludes>
-            </enforceBytecodeVersion>
-          </rules>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

From 079189a1a15df3a6151e31bbaa0548e871f06113 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 22 Oct 2024 19:51:38 +0200
Subject: [PATCH 3/5] Switch to release

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

diff --git a/pom.xml b/pom.xml
index 0964c208..db94ddc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <mavenVersion>4.0.0-beta-5-SNAPSHOT</mavenVersion>
+    <mavenVersion>4.0.0-beta-5</mavenVersion>
     <javaVersion>17</javaVersion>
 
     <guiceVersion>6.0.0</guiceVersion>

From 67a86ad6c139c1806e60473ea6d74cadc66be6b4 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 23 Oct 2024 08:33:01 +0200
Subject: [PATCH 4/5] Use beta-5 to build

---
 .github/workflows/maven-verify.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 56062b54..ff3f00c3 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -26,6 +26,6 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
     with:
-      ff-maven: "4.0.0-beta-3"                     # Maven version for fail-fast-build
-      maven-matrix: '[ "4.0.0-beta-3" ]'
+      ff-maven: "4.0.0-beta-5"                     # Maven version for fail-fast-build
+      maven-matrix: '[ "4.0.0-beta-5" ]'
       jdk-matrix: '[ "17", "21" ]'

From c0a27fbbb021b1d551cdb156420ae2c13ef40473 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 13 Nov 2024 23:29:16 +0100
Subject: [PATCH 5/5] Upgrade to released plugin-testing

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

diff --git a/pom.xml b/pom.xml
index db94ddc4..49643f72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@ under the License.
     <guiceVersion>6.0.0</guiceVersion>
     <mavenFilteringVersion>4.0.0-beta-1</mavenFilteringVersion>
     <mavenPluginPluginVersion>4.0.0-beta-1</mavenPluginPluginVersion>
-    <mavenPluginTestingVersion>4.0.0-beta-2-SNAPSHOT</mavenPluginTestingVersion>
+    <mavenPluginTestingVersion>4.0.0-beta-2</mavenPluginTestingVersion>
     <plexusBuildApiVersion>0.0.7</plexusBuildApiVersion>
     <sisuVersion>0.9.0.M2</sisuVersion>
     <slf4jVersion>2.0.13</slf4jVersion>