You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2026/06/16 19:53:57 UTC
(maven) 01/01: Move testing classes from org.apache.maven.api to org.apache.maven.impl
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch move-testing-package-master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ad9f6ed9b2e6474a86ec7cce4ae2cd569a980157
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jun 16 19:53:13 2026 +0000
Move testing classes from org.apache.maven.api to org.apache.maven.impl
The testing support classes (MojoExtension, MavenDIExtension, stubs, etc.)
in impl/maven-testing are not part of the public API and should not be in
the org.apache.maven.api namespace. Move them to org.apache.maven.impl
to correctly reflect their implementation status.
---
.../maven/{api => impl}/di/testing/MavenDIExtension.java | 2 +-
.../maven/{api => impl}/di/testing/MavenDITest.java | 2 +-
.../maven/{api => impl}/plugin/testing/Basedir.java | 2 +-
.../maven/{api => impl}/plugin/testing/InjectMojo.java | 2 +-
.../{api => impl}/plugin/testing/MojoExtension.java | 16 ++++++++--------
.../{api => impl}/plugin/testing/MojoParameter.java | 2 +-
.../{api => impl}/plugin/testing/MojoParameters.java | 2 +-
.../maven/{api => impl}/plugin/testing/MojoTest.java | 2 +-
.../plugin/testing/SecDispatcherProvider.java | 2 +-
.../{api => impl}/plugin/testing/stubs/ArtifactStub.java | 2 +-
.../{api => impl}/plugin/testing/stubs/LookupStub.java | 2 +-
.../plugin/testing/stubs/MojoExecutionStub.java | 2 +-
.../{api => impl}/plugin/testing/stubs/PluginStub.java | 2 +-
.../plugin/testing/stubs/ProducedArtifactStub.java | 2 +-
.../{api => impl}/plugin/testing/stubs/ProjectStub.java | 2 +-
.../plugin/testing/stubs/RepositorySystemSupplier.java | 2 +-
.../{api => impl}/plugin/testing/stubs/SessionMock.java | 2 +-
.../{api => impl}/plugin/testing/stubs/SessionStub.java | 2 +-
.../maven/{api => impl}/di/testing/SimpleDITest.java | 6 +++---
.../plugin/testing/ExpressionEvaluatorTest.java | 6 +++---
.../plugin/testing/MojoRealSessionTest.java | 4 ++--
.../META-INF/maven/org.apache.maven.api.di.Inject | 2 +-
.../src/test/resources/META-INF/maven/plugin.xml | 2 +-
.../gitlab/tkslaw/ditests/InjectServiceMojoTests.java | 4 ++--
.../java/com/gitlab/tkslaw/ditests/TestProviders.java | 4 ++--
.../java/org/apache/maven/plugins/HelloMojoTest.java | 6 +++---
26 files changed, 42 insertions(+), 42 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/impl/di/testing/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/impl/di/testing/MavenDIExtension.java
index 8b43165de7..54a9a52a9a 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/impl/di/testing/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.impl.di.testing;
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/impl/di/testing/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/impl/di/testing/MavenDITest.java
index c05f47cad0..67ade08eaa 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/impl/di/testing/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.impl.di.testing;
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/impl/plugin/testing/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/impl/plugin/testing/Basedir.java
index 98df10adfc..4cef0df381 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/impl/plugin/testing/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.impl.plugin.testing;
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/impl/plugin/testing/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/impl/plugin/testing/InjectMojo.java
index 2cd4738e1c..83b1d30ea1 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/impl/plugin/testing/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.impl.plugin.testing;
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/impl/plugin/testing/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/impl/plugin/testing/MojoExtension.java
index 13138d3251..50a7486858 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/impl/plugin/testing/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.impl.plugin.testing;
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;
@@ -86,8 +79,15 @@
import org.apache.maven.di.Key;
import org.apache.maven.di.impl.DIException;
import org.apache.maven.impl.InternalSession;
+import org.apache.maven.impl.di.testing.MavenDIExtension;
import org.apache.maven.impl.model.DefaultModelPathTranslator;
import org.apache.maven.impl.model.DefaultPathTranslator;
+import org.apache.maven.impl.plugin.testing.stubs.MojoExecutionStub;
+import org.apache.maven.impl.plugin.testing.stubs.PluginStub;
+import org.apache.maven.impl.plugin.testing.stubs.ProducedArtifactStub;
+import org.apache.maven.impl.plugin.testing.stubs.ProjectStub;
+import org.apache.maven.impl.plugin.testing.stubs.RepositorySystemSupplier;
+import org.apache.maven.impl.plugin.testing.stubs.SessionMock;
import org.apache.maven.internal.impl.DefaultLog;
import org.apache.maven.internal.xml.XmlPlexusConfiguration;
import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
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/impl/plugin/testing/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/impl/plugin/testing/MojoParameter.java
index 1ced028c62..000d37ea7c 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/impl/plugin/testing/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.impl.plugin.testing;
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/impl/plugin/testing/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/impl/plugin/testing/MojoParameters.java
index d5dd5833b6..c1c2494d6e 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/impl/plugin/testing/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.impl.plugin.testing;
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/impl/plugin/testing/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/impl/plugin/testing/MojoTest.java
index 16ced3b9e2..00e7aa79c0 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/impl/plugin/testing/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.impl.plugin.testing;
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/impl/plugin/testing/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/impl/plugin/testing/SecDispatcherProvider.java
index 3f7c676f4d..bc1462160f 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/impl/plugin/testing/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.impl.plugin.testing;
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/impl/plugin/testing/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/impl/plugin/testing/stubs/ArtifactStub.java
index e266da85e9..0892a81724 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/impl/plugin/testing/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.impl.plugin.testing.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/impl/plugin/testing/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/impl/plugin/testing/stubs/LookupStub.java
index 157bfcf3f8..2079aa2b35 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/impl/plugin/testing/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.impl.plugin.testing.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/impl/plugin/testing/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/impl/plugin/testing/stubs/MojoExecutionStub.java
index a2a15953bf..18e271b30e 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/impl/plugin/testing/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.impl.plugin.testing.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/impl/plugin/testing/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/impl/plugin/testing/stubs/PluginStub.java
index 7692bc775b..93a502afc4 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/impl/plugin/testing/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.impl.plugin.testing.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/impl/plugin/testing/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/impl/plugin/testing/stubs/ProducedArtifactStub.java
index 9d249d7faa..e13197c82d 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/impl/plugin/testing/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.impl.plugin.testing.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/impl/plugin/testing/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/impl/plugin/testing/stubs/ProjectStub.java
index 7968bb10fa..15d4131d6f 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/impl/plugin/testing/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.impl.plugin.testing.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/impl/plugin/testing/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/impl/plugin/testing/stubs/RepositorySystemSupplier.java
index a2b3b959d4..252c5d46b8 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/impl/plugin/testing/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.impl.plugin.testing.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/impl/plugin/testing/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/impl/plugin/testing/stubs/SessionMock.java
index bf7ddefb3a..2861aface4 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/impl/plugin/testing/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.impl.plugin.testing.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/impl/plugin/testing/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/impl/plugin/testing/stubs/SessionStub.java
index 9b09216c99..f21069adb9 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/impl/plugin/testing/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.impl.plugin.testing.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/impl/di/testing/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/impl/di/testing/SimpleDITest.java
index b2f7858508..34167ce9d1 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/impl/di/testing/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.impl.di.testing;
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.impl.plugin.testing.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.impl.di.testing.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/impl/plugin/testing/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/impl/plugin/testing/ExpressionEvaluatorTest.java
index 65868a2abc..e830db7600 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/impl/plugin/testing/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.impl.plugin.testing;
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.impl.plugin.testing.stubs.ProjectStub;
+import org.apache.maven.impl.plugin.testing.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/MojoRealSessionTest.java b/impl/maven-testing/src/test/java/org/apache/maven/impl/plugin/testing/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/impl/plugin/testing/MojoRealSessionTest.java
index 114a649199..5d4e01157d 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/impl/plugin/testing/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.impl.plugin.testing;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -25,7 +25,7 @@
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.plugin.testing.stubs.SessionMock;
import org.apache.maven.impl.standalone.ApiRunner;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
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..3e4cefff5c 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.impl.plugin.testing.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..a8eea2f721 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.impl.plugin.testing.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..72fbbd8d03 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.impl.plugin.testing.InjectMojo;
+import org.apache.maven.impl.plugin.testing.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..2e78232299 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.impl.plugin.testing.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.impl.plugin.testing.MojoExtension.getBasedir;
@Named
public class TestProviders {
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..c5e3ea6402 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.impl.plugin.testing.InjectMojo;
+import org.apache.maven.impl.plugin.testing.MojoParameter;
+import org.apache.maven.impl.plugin.testing.MojoTest;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;