From 0278fedf0449d7ad445f19251731d2bfdee1b604 Mon Sep 17 00:00:00 2001
From: Kamil Krzywanski <kamilkrzywanski01@gmail.com>
Date: Sun, 19 Apr 2026 02:03:43 +0200
Subject: [PATCH] Prepare for bump guice with fix
 https://github.com/google/guice/pull/1932 and fix issue
 https://github.com/google/guice/issues/1901

---
 .../apache/maven/internal/impl/SisuDiBridgeModule.java    | 8 +++-----
 .../src/test/resources/mng-8525-maven-di-plugin/pom.xml   | 2 +-
 pom.xml                                                   | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/SisuDiBridgeModule.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/SisuDiBridgeModule.java
index eeb6215f9357..9c9a1ae3237d 100644
--- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/SisuDiBridgeModule.java
+++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/SisuDiBridgeModule.java
@@ -19,7 +19,6 @@
 package org.apache.maven.internal.impl;
 
 import javax.inject.Named;
-import javax.inject.Provider;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -37,6 +36,7 @@
 import com.google.inject.Binder;
 import com.google.inject.name.Names;
 import com.google.inject.spi.ProviderInstanceBinding;
+import jakarta.inject.Provider;
 import org.apache.maven.api.di.MojoExecutionScoped;
 import org.apache.maven.api.di.SessionScoped;
 import org.apache.maven.di.Injector;
@@ -177,9 +177,8 @@ public <Q> Supplier<Q> getCompiledBinding(Dependency<Q> dep) {
         }
 
         private <Q> Supplier<Q> getBeanSupplier(Dependency<Q> dep, Key<Q> key) {
-            List<Binding<?>> list = new ArrayList<>();
             // Add DI bindings
-            list.addAll(getBindings().getOrDefault(key, Set.of()));
+            List<Binding<?>> list = new ArrayList<>(getBindings().getOrDefault(key, Set.of()));
             // Add Plexus bindings
             for (var bean : locator.get().locate(toGuiceKey(key))) {
                 if (isPlexusBean(bean)) {
@@ -223,9 +222,8 @@ public <T> Set<Binding<T>> getAllBindings(Class<T> clazz) {
         private <Q> Supplier<Q> getListSupplier(Key<Q> key) {
             Key<Object> elementType = key.getTypeParameter(0);
             return () -> {
-                List<Binding<?>> list = new ArrayList<>();
                 // Add DI bindings
-                list.addAll(getBindings().getOrDefault(elementType, Set.of()));
+                List<Binding<?>> list = new ArrayList<>(getBindings().getOrDefault(elementType, Set.of()));
                 // Add Plexus bindings
                 for (var bean : locator.get().locate(toGuiceKey(elementType))) {
                     if (isPlexusBean(bean)) {
diff --git a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml
index 40e339101961..e8665fc91238 100644
--- a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml
@@ -31,7 +31,7 @@ under the License.
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <javaVersion>17</javaVersion>
-    <guiceVersion>6.0.0</guiceVersion>
+    <guiceVersion>7.0.0</guiceVersion>
     <mavenVersion>4.0.0-beta-5</mavenVersion>
     <mavenPluginPluginVersion>4.0.0-beta-1</mavenPluginPluginVersion>
     <mavenPluginTestingVersion>4.0.0-beta-2</mavenPluginTestingVersion>
diff --git a/pom.xml b/pom.xml
index 7b8eb947bca2..3aec0ee38a75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,10 +144,10 @@ under the License.
     <!-- various versions -->
     <asmVersion>9.9.1</asmVersion>
     <byteBuddyVersion>1.18.8</byteBuddyVersion>
-    <classWorldsVersion>2.9.0</classWorldsVersion>
+    <classWorldsVersion>2.10.0</classWorldsVersion>
     <commonsCliVersion>1.11.0</commonsCliVersion>
     <domtripVersion>0.4.1</domtripVersion>
-    <guiceVersion>5.1.0</guiceVersion>
+    <guiceVersion>7.0.0</guiceVersion>
     <guavaVersion>33.6.0-jre</guavaVersion>
     <guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>