From 0bf1f4f4d85df5ef5f5eb4f126923b37fbeb4815 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 8 Dec 2023 18:48:18 +0100
Subject: [PATCH 1/2] Prepare for alpha-9

Seems old plexus and stuff creeps in via plexus-xml
---
 maven-resolver-supplier/pom.xml | 12 ++++++++++++
 pom.xml                         |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/maven-resolver-supplier/pom.xml b/maven-resolver-supplier/pom.xml
index 525c9324c..20287346d 100644
--- a/maven-resolver-supplier/pom.xml
+++ b/maven-resolver-supplier/pom.xml
@@ -83,6 +83,14 @@
           <groupId>org.eclipse.sisu</groupId>
           <artifactId>org.eclipse.sisu.inject</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.inject</groupId>
+          <artifactId>guice</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -98,6 +106,10 @@
           <groupId>org.eclipse.sisu</groupId>
           <artifactId>org.eclipse.sisu.inject</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>org.eclipse.sisu.plexus</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 178a31526..13ed3c602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
     <!-- Used by Jetty Transport (client) and Test HTTP (server) -->
     <jettyVersion>10.0.18</jettyVersion>
     <!-- used by supplier and demo only -->
-    <mavenVersion>4.0.0-alpha-8</mavenVersion>
+    <mavenVersion>4.0.0-alpha-10-SNAPSHOT</mavenVersion>
     <minimalMavenBuildVersion>[3.8.8,)</minimalMavenBuildVersion>
     <!-- MRESOLVER-422: keep this in sync with Javadoc plugin configuration (but cannot directly, as this below is range) -->
     <minimalJavaBuildVersion>[17,)</minimalJavaBuildVersion>

From c579ca40ebb5dc4726b56e8365d6418e7cf4f5e2 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Tue, 12 Dec 2023 10:33:49 +0100
Subject: [PATCH 2/2] Maven alpha-9 released

---
 maven-resolver-supplier/pom.xml | 4 ++++
 pom.xml                         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/maven-resolver-supplier/pom.xml b/maven-resolver-supplier/pom.xml
index 20287346d..81de91f26 100644
--- a/maven-resolver-supplier/pom.xml
+++ b/maven-resolver-supplier/pom.xml
@@ -102,6 +102,10 @@
           <groupId>javax.inject</groupId>
           <artifactId>javax.inject</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>jakarta.inject</groupId>
+          <artifactId>jakarta.inject-api</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.eclipse.sisu</groupId>
           <artifactId>org.eclipse.sisu.inject</artifactId>
diff --git a/pom.xml b/pom.xml
index c0e6e8496..58fa4947a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
     <!-- Used by Jetty Transport (client) and Test HTTP (server) -->
     <jettyVersion>10.0.18</jettyVersion>
     <!-- used by supplier and demo only -->
-    <mavenVersion>4.0.0-alpha-10-SNAPSHOT</mavenVersion>
+    <mavenVersion>4.0.0-alpha-9</mavenVersion>
     <minimalMavenBuildVersion>[3.8.8,)</minimalMavenBuildVersion>
     <!-- MRESOLVER-422: keep this in sync with Javadoc plugin configuration (but cannot directly, as this below is range) -->
     <minimalJavaBuildVersion>[17,)</minimalJavaBuildVersion>