From 5f77822f0105bad282b2038fd1d42a48ab2be336 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Sat, 24 Oct 2026 13:14:35 +0200
Subject: [PATCH] Test with maven-testing and drop the explicit Guice
 dependency

maven-testing brings the Guice and maven-xml that Maven core ships; the retired plugin-testing harness did not, which is why Guice was declared and maven-xml pinned here.
---
 pom.xml                                       | 27 +++----------------
 .../plugins/deploy/DeployFileMojoTest.java    |  2 +-
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index a29d2f4f..8c4f985c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,8 +71,6 @@ under the License.
     <javaVersion>17</javaVersion>
     <mavenVersion>4.0.0-rc-7</mavenVersion>
 
-    <guiceVersion>7.0.0</guiceVersion>
-    <mavenPluginTestingVersion>4.0.0-beta-4</mavenPluginTestingVersion>
     <mavenResolverVersion>2.0.24</mavenResolverVersion>
     <mockitoVersion>5.24.0</mockitoVersion>
     <slf4jVersion>2.0.20</slf4jVersion>
@@ -95,19 +93,6 @@ under the License.
         <artifactId>guava</artifactId>
         <version>33.7.2-jre</version>
       </dependency>
-      <!--
-        maven-plugin-testing-harness 4.0.0-beta-4 transitively pins maven-xml to 4.0.0-rc-3
-        and pulls in maven-xml-impl 4.0.0-alpha-9 (an artifact ID that no longer exists
-        from rc-4 onward; the XmlService implementation moved into maven-xml itself).
-        Pin maven-xml to ${mavenVersion} so the right XmlService provider is on the
-        test classpath; otherwise Holder.<clinit> fails with
-        "No XmlService implementation found" and every unit test errors out.
-      -->
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-xml</artifactId>
-        <version>${mavenVersion}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -139,9 +124,9 @@ under the License.
 
     <!-- Test -->
     <dependency>
-      <groupId>org.apache.maven.plugin-testing</groupId>
-      <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>${mavenPluginTestingVersion}</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-testing</artifactId>
+      <version>${mavenVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -162,12 +147,6 @@ under the License.
       <version>${mavenVersion}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>${guiceVersion}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
diff --git a/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java b/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java
index 13f6c105..88c05621 100644
--- a/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java
@@ -37,12 +37,12 @@
 import org.apache.maven.api.plugin.testing.InjectMojo;
 import org.apache.maven.api.plugin.testing.MojoParameter;
 import org.apache.maven.api.plugin.testing.MojoTest;
-import org.apache.maven.api.plugin.testing.stubs.ArtifactStub;
 import org.apache.maven.api.plugin.testing.stubs.SessionMock;
 import org.apache.maven.api.services.ArtifactDeployer;
 import org.apache.maven.api.services.ArtifactDeployerRequest;
 import org.apache.maven.api.services.ArtifactManager;
 import org.apache.maven.impl.InternalSession;
+import org.apache.maven.testing.plugin.stubs.ArtifactStub;
 import org.junit.jupiter.api.Test;
 
 import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;