This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new bacafe0799 Move testing classes from org.apache.maven.api to
org.apache.maven.testing (#12276)
bacafe0799 is described below
commit bacafe0799d520eb5428145fb14eadd788254752
Author: Guillaume Nodet <[email protected]>
AuthorDate: Wed Jun 17 12:12:07 2026 +0200
Move testing classes from org.apache.maven.api to org.apache.maven.testing
(#12276)
Move classes from org.apache.maven.api.di.testing and
org.apache.maven.api.plugin.testing to org.apache.maven.testing.di
and org.apache.maven.testing.plugin
---
.../testing => testing/di}/MavenDIExtension.java | 2 +-
.../di/testing => testing/di}/MavenDITest.java | 2 +-
.../plugin/testing => testing/plugin}/Basedir.java | 2 +-
.../testing => testing/plugin}/InjectMojo.java | 2 +-
.../testing => testing/plugin}/MojoExtension.java | 16 ++---
.../testing => testing/plugin}/MojoParameter.java | 2 +-
.../testing => testing/plugin}/MojoParameters.java | 2 +-
.../testing => testing/plugin}/MojoTest.java | 2 +-
.../plugin}/SecDispatcherProvider.java | 2 +-
.../plugin}/stubs/ArtifactStub.java | 2 +-
.../plugin}/stubs/LookupStub.java | 2 +-
.../plugin}/stubs/MojoExecutionStub.java | 2 +-
.../plugin}/stubs/PluginStub.java | 2 +-
.../plugin}/stubs/ProducedArtifactStub.java | 2 +-
.../plugin}/stubs/ProjectStub.java | 2 +-
.../plugin}/stubs/RepositorySystemSupplier.java | 2 +-
.../plugin}/stubs/SessionMock.java | 2 +-
.../plugin}/stubs/SessionStub.java | 2 +-
.../di/testing => testing/di}/SimpleDITest.java | 6 +-
.../plugin}/ExpressionEvaluatorTest.java | 6 +-
.../plugin}/MojoExtensionModelTest.java | 2 +-
.../plugin}/MojoRealSessionTest.java | 4 +-
.../META-INF/maven/org.apache.maven.api.di.Inject | 2 +-
.../src/test/resources/META-INF/maven/plugin.xml | 2 +-
.../tkslaw/ditests/InjectServiceMojoTests.java | 4 +-
.../com/gitlab/tkslaw/ditests/TestProviders.java | 4 +-
.../resources/mng-8525-maven-di-plugin/pom.xml | 72 +---------------------
.../org/apache/maven/plugins/HelloMojoTest.java | 6 +-
28 files changed, 45 insertions(+), 113 deletions(-)
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/di/MavenDIExtension.java
similarity index 99%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/di/MavenDIExtension.java
index 8b43165de7..aa2d33e63e 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/di/MavenDIExtension.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.di.testing;
+package org.apache.maven.testing.di;
import java.io.File;
import java.util.Optional;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDITest.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/di/MavenDITest.java
similarity index 98%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDITest.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/di/MavenDITest.java
index c05f47cad0..7025d1ac74 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDITest.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/di/MavenDITest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.di.testing;
+package org.apache.maven.testing.di;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/Basedir.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/Basedir.java
similarity index 98%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/Basedir.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/Basedir.java
index 98df10adfc..f3762ecf1e 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/Basedir.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/Basedir.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing;
+package org.apache.maven.testing.plugin;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/InjectMojo.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/InjectMojo.java
similarity index 98%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/InjectMojo.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/InjectMojo.java
index 2cd4738e1c..b2be929162 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/InjectMojo.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/InjectMojo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing;
+package org.apache.maven.testing.plugin;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
similarity index 98%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
index df777a1ba9..59f2144ffc 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing;
+package org.apache.maven.testing.plugin;
import javax.xml.stream.XMLStreamException;
@@ -52,7 +52,6 @@
import org.apache.maven.api.di.Priority;
import org.apache.maven.api.di.Provides;
import org.apache.maven.api.di.Singleton;
-import org.apache.maven.api.di.testing.MavenDIExtension;
import org.apache.maven.api.model.Build;
import org.apache.maven.api.model.ConfigurationContainer;
import org.apache.maven.api.model.Model;
@@ -62,12 +61,6 @@
import org.apache.maven.api.plugin.descriptor.MojoDescriptor;
import org.apache.maven.api.plugin.descriptor.Parameter;
import org.apache.maven.api.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.api.plugin.testing.stubs.MojoExecutionStub;
-import org.apache.maven.api.plugin.testing.stubs.PluginStub;
-import org.apache.maven.api.plugin.testing.stubs.ProducedArtifactStub;
-import org.apache.maven.api.plugin.testing.stubs.ProjectStub;
-import org.apache.maven.api.plugin.testing.stubs.RepositorySystemSupplier;
-import org.apache.maven.api.plugin.testing.stubs.SessionMock;
import org.apache.maven.api.services.ArtifactDeployer;
import org.apache.maven.api.services.ArtifactFactory;
import org.apache.maven.api.services.ArtifactInstaller;
@@ -95,6 +88,13 @@
import org.apache.maven.model.v4.MavenStaxReader;
import org.apache.maven.plugin.PluginParameterExpressionEvaluatorV4;
import org.apache.maven.plugin.descriptor.io.PluginDescriptorStaxReader;
+import org.apache.maven.testing.di.MavenDIExtension;
+import org.apache.maven.testing.plugin.stubs.MojoExecutionStub;
+import org.apache.maven.testing.plugin.stubs.PluginStub;
+import org.apache.maven.testing.plugin.stubs.ProducedArtifactStub;
+import org.apache.maven.testing.plugin.stubs.ProjectStub;
+import org.apache.maven.testing.plugin.stubs.RepositorySystemSupplier;
+import org.apache.maven.testing.plugin.stubs.SessionMock;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import
org.codehaus.plexus.component.configurator.expression.TypeAwareExpressionEvaluator;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoParameter.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoParameter.java
similarity index 98%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoParameter.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoParameter.java
index 1ced028c62..9940103a31 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoParameter.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoParameter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing;
+package org.apache.maven.testing.plugin;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoParameters.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoParameters.java
similarity index 98%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoParameters.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoParameters.java
index d5dd5833b6..a031381c65 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoParameters.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoParameters.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing;
+package org.apache.maven.testing.plugin;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoTest.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoTest.java
similarity index 98%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoTest.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoTest.java
index 16ced3b9e2..50a574e888 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoTest.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing;
+package org.apache.maven.testing.plugin;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/SecDispatcherProvider.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/SecDispatcherProvider.java
similarity index 98%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/SecDispatcherProvider.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/SecDispatcherProvider.java
index 3f7c676f4d..ec36980987 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/SecDispatcherProvider.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/SecDispatcherProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing;
+package org.apache.maven.testing.plugin;
import java.util.Map;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/ArtifactStub.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/ArtifactStub.java
similarity index 99%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/ArtifactStub.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/ArtifactStub.java
index e266da85e9..ce0a339708 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/ArtifactStub.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/ArtifactStub.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing.stubs;
+package org.apache.maven.testing.plugin.stubs;
import java.util.Objects;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/LookupStub.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/LookupStub.java
similarity index 97%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/LookupStub.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/LookupStub.java
index 157bfcf3f8..44d3365b26 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/LookupStub.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/LookupStub.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing.stubs;
+package org.apache.maven.testing.plugin.stubs;
import java.util.List;
import java.util.Map;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/MojoExecutionStub.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/MojoExecutionStub.java
similarity index 98%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/MojoExecutionStub.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/MojoExecutionStub.java
index a2a15953bf..f82fab0d6d 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/MojoExecutionStub.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/MojoExecutionStub.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing.stubs;
+package org.apache.maven.testing.plugin.stubs;
import java.util.Optional;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/PluginStub.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/PluginStub.java
similarity index 98%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/PluginStub.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/PluginStub.java
index 7692bc775b..026cf373d6 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/PluginStub.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/PluginStub.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing.stubs;
+package org.apache.maven.testing.plugin.stubs;
import java.util.Collections;
import java.util.List;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProducedArtifactStub.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/ProducedArtifactStub.java
similarity index 96%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProducedArtifactStub.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/ProducedArtifactStub.java
index 9d249d7faa..b4331f8f28 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProducedArtifactStub.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/ProducedArtifactStub.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing.stubs;
+package org.apache.maven.testing.plugin.stubs;
import org.apache.maven.api.ProducedArtifact;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/ProjectStub.java
similarity index 99%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/ProjectStub.java
index 7968bb10fa..d00427d19f 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/ProjectStub.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing.stubs;
+package org.apache.maven.testing.plugin.stubs;
import java.nio.file.Path;
import java.util.Arrays;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java
similarity index 99%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java
index a2b3b959d4..a024a13698 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing.stubs;
+package org.apache.maven.testing.plugin.stubs;
import java.util.ArrayList;
import java.util.HashMap;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/SessionMock.java
similarity index 99%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/SessionMock.java
index bf7ddefb3a..a4a1131b6e 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/SessionMock.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing.stubs;
+package org.apache.maven.testing.plugin.stubs;
import java.net.URI;
import java.nio.file.Path;
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionStub.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/SessionStub.java
similarity index 99%
rename from
impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionStub.java
rename to
impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/SessionStub.java
index 9b09216c99..51ca49b6e7 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionStub.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/SessionStub.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing.stubs;
+package org.apache.maven.testing.plugin.stubs;
import java.nio.file.Path;
import java.time.Instant;
diff --git
a/impl/maven-testing/src/test/java/org/apache/maven/api/di/testing/SimpleDITest.java
b/impl/maven-testing/src/test/java/org/apache/maven/testing/di/SimpleDITest.java
similarity index 93%
rename from
impl/maven-testing/src/test/java/org/apache/maven/api/di/testing/SimpleDITest.java
rename to
impl/maven-testing/src/test/java/org/apache/maven/testing/di/SimpleDITest.java
index b2f7858508..e827d73a3c 100644
---
a/impl/maven-testing/src/test/java/org/apache/maven/api/di/testing/SimpleDITest.java
+++
b/impl/maven-testing/src/test/java/org/apache/maven/testing/di/SimpleDITest.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.di.testing;
+package org.apache.maven.testing.di;
import java.io.File;
import org.apache.maven.api.Session;
import org.apache.maven.api.di.Inject;
import org.apache.maven.api.di.Provides;
-import org.apache.maven.api.plugin.testing.stubs.SessionMock;
+import org.apache.maven.testing.plugin.stubs.SessionMock;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
-import static org.apache.maven.api.di.testing.MavenDIExtension.getBasedir;
+import static org.apache.maven.testing.di.MavenDIExtension.getBasedir;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
diff --git
a/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/ExpressionEvaluatorTest.java
b/impl/maven-testing/src/test/java/org/apache/maven/testing/plugin/ExpressionEvaluatorTest.java
similarity index 98%
rename from
impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/ExpressionEvaluatorTest.java
rename to
impl/maven-testing/src/test/java/org/apache/maven/testing/plugin/ExpressionEvaluatorTest.java
index 65868a2abc..ba5fac2f4b 100644
---
a/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/ExpressionEvaluatorTest.java
+++
b/impl/maven-testing/src/test/java/org/apache/maven/testing/plugin/ExpressionEvaluatorTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing;
+package org.apache.maven.testing.plugin;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -30,8 +30,8 @@
import org.apache.maven.api.di.Provides;
import org.apache.maven.api.plugin.MojoException;
import org.apache.maven.api.plugin.annotations.Mojo;
-import org.apache.maven.api.plugin.testing.stubs.ProjectStub;
-import org.apache.maven.api.plugin.testing.stubs.SessionMock;
+import org.apache.maven.testing.plugin.stubs.ProjectStub;
+import org.apache.maven.testing.plugin.stubs.SessionMock;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
diff --git
a/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoExtensionModelTest.java
b/impl/maven-testing/src/test/java/org/apache/maven/testing/plugin/MojoExtensionModelTest.java
similarity index 98%
rename from
impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoExtensionModelTest.java
rename to
impl/maven-testing/src/test/java/org/apache/maven/testing/plugin/MojoExtensionModelTest.java
index a6b2df0855..a5647feeb1 100644
---
a/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoExtensionModelTest.java
+++
b/impl/maven-testing/src/test/java/org/apache/maven/testing/plugin/MojoExtensionModelTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing;
+package org.apache.maven.testing.plugin;
import java.nio.file.Path;
import java.nio.file.Paths;
diff --git
a/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoRealSessionTest.java
b/impl/maven-testing/src/test/java/org/apache/maven/testing/plugin/MojoRealSessionTest.java
similarity index 96%
rename from
impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoRealSessionTest.java
rename to
impl/maven-testing/src/test/java/org/apache/maven/testing/plugin/MojoRealSessionTest.java
index 114a649199..3bf66bc707 100644
---
a/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoRealSessionTest.java
+++
b/impl/maven-testing/src/test/java/org/apache/maven/testing/plugin/MojoRealSessionTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.api.plugin.testing;
+package org.apache.maven.testing.plugin;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -25,8 +25,8 @@
import org.apache.maven.api.di.Inject;
import org.apache.maven.api.di.Provides;
import org.apache.maven.api.di.Singleton;
-import org.apache.maven.api.plugin.testing.stubs.SessionMock;
import org.apache.maven.impl.standalone.ApiRunner;
+import org.apache.maven.testing.plugin.stubs.SessionMock;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
diff --git
a/impl/maven-testing/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject
b/impl/maven-testing/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject
index 2a771d76eb..4c1d6f0dd9 100644
---
a/impl/maven-testing/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject
+++
b/impl/maven-testing/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.maven.api.plugin.testing.ExpressionEvaluatorTest$ExpressionEvaluatorMojo
\ No newline at end of file
+org.apache.maven.testing.plugin.ExpressionEvaluatorTest$ExpressionEvaluatorMojo
\ No newline at end of file
diff --git a/impl/maven-testing/src/test/resources/META-INF/maven/plugin.xml
b/impl/maven-testing/src/test/resources/META-INF/maven/plugin.xml
index ca0b24ff89..f4c4dea370 100644
--- a/impl/maven-testing/src/test/resources/META-INF/maven/plugin.xml
+++ b/impl/maven-testing/src/test/resources/META-INF/maven/plugin.xml
@@ -73,7 +73,7 @@ under the License.
</parameter>
<parameter>
<name>beanParam</name>
-
<type>org.apache.maven.api.plugin.testing.ExpressionEvaluatorTest$TestBean</type>
+
<type>org.apache.maven.testing.plugin.ExpressionEvaluatorTest$TestBean</type>
</parameter>
<parameter>
<name>intValue</name>
diff --git
a/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/InjectServiceMojoTests.java
b/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/InjectServiceMojoTests.java
index 0d66702097..350bb1dc8e 100644
---
a/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/InjectServiceMojoTests.java
+++
b/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/InjectServiceMojoTests.java
@@ -18,8 +18,8 @@
*/
package com.gitlab.tkslaw.ditests;
-import org.apache.maven.api.plugin.testing.InjectMojo;
-import org.apache.maven.api.plugin.testing.MojoTest;
+import org.apache.maven.testing.plugin.InjectMojo;
+import org.apache.maven.testing.plugin.MojoTest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git
a/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/TestProviders.java
b/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/TestProviders.java
index 0933a15248..8799bc8ea3 100644
---
a/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/TestProviders.java
+++
b/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/TestProviders.java
@@ -24,7 +24,7 @@
import org.apache.maven.api.di.Priority;
import org.apache.maven.api.di.Provides;
import org.apache.maven.api.di.Singleton;
-import org.apache.maven.api.plugin.testing.stubs.SessionMock;
+import org.apache.maven.testing.plugin.stubs.SessionMock;
import org.apache.maven.api.services.DependencyResolver;
import org.apache.maven.api.services.OsService;
import org.apache.maven.api.services.ToolchainManager;
@@ -33,7 +33,7 @@
import org.apache.maven.impl.model.DefaultOsService;
import org.mockito.Mockito;
-import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;
+import static org.apache.maven.testing.plugin.MojoExtension.getBasedir;
@Named
public class TestProviders {
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 40e3391019..37894b757d 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,32 +31,10 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javaVersion>17</javaVersion>
- <guiceVersion>6.0.0</guiceVersion>
- <mavenVersion>4.0.0-beta-5</mavenVersion>
+ <mavenVersion>4.1.0-SNAPSHOT</mavenVersion>
<mavenPluginPluginVersion>4.0.0-beta-1</mavenPluginPluginVersion>
- <mavenPluginTestingVersion>4.0.0-beta-2</mavenPluginTestingVersion>
- <mavenResolverVersion>2.0.2</mavenResolverVersion>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>junit-bom</artifactId>
- <version>5.13.4</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-bom</artifactId>
- <version>5.20.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -70,59 +48,13 @@ under the License.
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
+ <artifactId>maven-testing</artifactId>
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-api</artifactId>
- <version>${mavenResolverVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-api-impl</artifactId>
- <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.apache.maven.plugin-testing</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>${mavenPluginTestingVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
diff --git
a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/src/test/java/org/apache/maven/plugins/HelloMojoTest.java
b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/src/test/java/org/apache/maven/plugins/HelloMojoTest.java
index 96875b4a68..7264358351 100644
---
a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/src/test/java/org/apache/maven/plugins/HelloMojoTest.java
+++
b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/src/test/java/org/apache/maven/plugins/HelloMojoTest.java
@@ -22,9 +22,9 @@
import org.apache.maven.api.di.Priority;
import org.apache.maven.api.di.Provides;
import org.apache.maven.api.di.Singleton;
-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.testing.plugin.InjectMojo;
+import org.apache.maven.testing.plugin.MojoParameter;
+import org.apache.maven.testing.plugin.MojoTest;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
