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
commit 5d1cfd47f384d175f62f3ab4ca6696351b1b2490 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Wed Apr 24 11:41:31 2024 +0200 Cleanup dependencies --- apache-maven/pom.xml | 5 ++++ api/maven-api-core/pom.xml | 2 +- api/maven-api-di/pom.xml | 7 ----- api/maven-api-metadata/pom.xml | 2 +- api/maven-api-model/pom.xml | 4 +++ api/maven-api-plugin/pom.xml | 4 +++ api/maven-api-settings/pom.xml | 10 +++++++ api/maven-api-toolchain/pom.xml | 4 +++ maven-api-impl/pom.xml | 60 ++++++++++++++++++++++++++++++++++++--- maven-artifact/pom.xml | 8 ++++++ maven-builder-support/pom.xml | 7 +++++ maven-compat/pom.xml | 6 ++++ maven-core/pom.xml | 20 +++++++++---- maven-di/pom.xml | 10 +++++++ maven-embedder/pom.xml | 10 +++++++ maven-jline/pom.xml | 4 +++ maven-model-builder/pom.xml | 32 +++++++++++++++------ maven-model/pom.xml | 20 +++++++++---- maven-plugin-api/pom.xml | 26 +++++++++++++++++ maven-repository-metadata/pom.xml | 14 +++++++++ maven-resolver-provider/pom.xml | 33 +++++++++++++++++++++ maven-settings-builder/pom.xml | 18 +++++++++--- maven-settings/pom.xml | 16 +++++++++++ maven-slf4j-provider/pom.xml | 11 +++++++ maven-slf4j-wrapper/pom.xml | 11 +++++++ maven-toolchain-builder/pom.xml | 19 +++++++++++++ maven-toolchain-model/pom.xml | 6 +++- maven-xml-impl/pom.xml | 10 +++++++ pom.xml | 9 ++++-- 29 files changed, 349 insertions(+), 39 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 4df9e58350..f6f193d75f 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -122,6 +122,11 @@ under the License. <artifactId>asm</artifactId> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> </dependencies> <pluginRepositories> diff --git a/api/maven-api-core/pom.xml b/api/maven-api-core/pom.xml index 57f5261acf..d983fae3de 100644 --- a/api/maven-api-core/pom.xml +++ b/api/maven-api-core/pom.xml @@ -53,7 +53,7 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-api-di</artifactId> + <artifactId>maven-api-xml</artifactId> </dependency> </dependencies> diff --git a/api/maven-api-di/pom.xml b/api/maven-api-di/pom.xml index 4d02109801..6f9086a51e 100644 --- a/api/maven-api-di/pom.xml +++ b/api/maven-api-di/pom.xml @@ -30,11 +30,4 @@ <name>Maven 4 API :: Dependency Injection</name> <description>Maven 4 API - Dependency Injection</description> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-api-meta</artifactId> - </dependency> - </dependencies> - </project> diff --git a/api/maven-api-metadata/pom.xml b/api/maven-api-metadata/pom.xml index ba4a488b4a..06df614e31 100644 --- a/api/maven-api-metadata/pom.xml +++ b/api/maven-api-metadata/pom.xml @@ -33,7 +33,7 @@ under the License. <dependencies> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-api-xml</artifactId> + <artifactId>maven-api-meta</artifactId> </dependency> </dependencies> diff --git a/api/maven-api-model/pom.xml b/api/maven-api-model/pom.xml index 6fe8f02d27..298470e6b5 100644 --- a/api/maven-api-model/pom.xml +++ b/api/maven-api-model/pom.xml @@ -32,6 +32,10 @@ under the License. <description>Maven 4 API - Immutable Model for Maven POM (Project Object Model).</description> <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-api-xml</artifactId> diff --git a/api/maven-api-plugin/pom.xml b/api/maven-api-plugin/pom.xml index a836cb23d1..29c6c982bf 100644 --- a/api/maven-api-plugin/pom.xml +++ b/api/maven-api-plugin/pom.xml @@ -31,6 +31,10 @@ under the License. <description>Maven 4 API - Immutable Plugin model.</description> <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-api-xml</artifactId> diff --git a/api/maven-api-settings/pom.xml b/api/maven-api-settings/pom.xml index 83f67cd4ea..cad0763042 100644 --- a/api/maven-api-settings/pom.xml +++ b/api/maven-api-settings/pom.xml @@ -32,10 +32,20 @@ under the License. <description>Maven 4 API - Immutable Settings model.</description> <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-api-xml</artifactId> </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/api/maven-api-toolchain/pom.xml b/api/maven-api-toolchain/pom.xml index 8f69884ee6..ada4845619 100644 --- a/api/maven-api-toolchain/pom.xml +++ b/api/maven-api-toolchain/pom.xml @@ -31,6 +31,10 @@ under the License. <description>Maven 4 API - Immutable Toolchain model.</description> <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-api-xml</artifactId> diff --git a/maven-api-impl/pom.xml b/maven-api-impl/pom.xml index 9431ebad27..212488ed1e 100644 --- a/maven-api-impl/pom.xml +++ b/maven-api-impl/pom.xml @@ -44,7 +44,27 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-di</artifactId> + <artifactId>maven-api-xml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-toolchain</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-di</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-model</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-settings</artifactId> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> @@ -62,20 +82,52 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>maven-xml-impl</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-interpolation</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-impl</artifactId> </dependency> + <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-interpolation</artifactId> + <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> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-di</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-named-locks</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-connector-basic</artifactId> diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index b04eb4f8c5..ae6784f644 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -30,6 +30,14 @@ under the License. <name>Maven Artifact</name> + <dependencies> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> <plugins> <plugin> diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index c41ff2405d..6283133394 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -31,4 +31,11 @@ under the License. <name>Maven Builder Support</name> <description>Support for descriptor builders (model, setting, toolchains)</description> + <dependencies> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 533b8b3636..1cc622de6a 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -95,6 +95,12 @@ under the License. <artifactId>org.eclipse.sisu.plexus</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.inject</artifactId> diff --git a/maven-core/pom.xml b/maven-core/pom.xml index cc420d83bb..37f5b3970d 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -138,6 +138,21 @@ under the License. </dependency> <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> @@ -153,11 +168,6 @@ under the License. <artifactId>xmlunit-assertj</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-params</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-testing</artifactId> diff --git a/maven-di/pom.xml b/maven-di/pom.xml index 065c979882..e283e41f29 100644 --- a/maven-di/pom.xml +++ b/maven-di/pom.xml @@ -34,6 +34,16 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>maven-api-di</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 9ed5aa16bc..79fa5cf181 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -147,11 +147,21 @@ under the License. <scope>provided</scope> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-params</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> diff --git a/maven-jline/pom.xml b/maven-jline/pom.xml index 2d58f13dfb..a7209468d2 100644 --- a/maven-jline/pom.xml +++ b/maven-jline/pom.xml @@ -30,6 +30,10 @@ under the License. <description>Provides the JLine integration in Maven</description> <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-api-core</artifactId> diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index ae6d92fdf6..0369bcced5 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -42,7 +42,15 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-xml-impl</artifactId> + <artifactId>maven-api-xml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-model</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -60,6 +68,14 @@ under the License. <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-interpolation</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-xml</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + </dependency> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> @@ -73,23 +89,23 @@ under the License. <!-- Testing --> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-core</artifactId> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-matchers</artifactId> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-assertj</artifactId> + <artifactId>xmlunit-matchers</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/maven-model/pom.xml b/maven-model/pom.xml index f5ed2e1058..2d5522de9e 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -38,11 +38,15 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-api-impl</artifactId> + <artifactId>maven-api-xml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-xml-impl</artifactId> + <artifactId>maven-api-impl</artifactId> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -50,14 +54,18 @@ under the License. </dependency> <dependency> - <groupId>org.openjdk.jmh</groupId> - <artifactId>jmh-core</artifactId> - <version>1.37</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.openjdk.jmh</groupId> - <artifactId>jmh-generator-annprocess</artifactId> + <artifactId>jmh-core</artifactId> <version>1.37</version> <scope>test</scope> </dependency> diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index ae809caade..c2b2e397ad 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -32,10 +32,22 @@ under the License. <description>The API for Maven 3 plugins - Mojos - development.</description> <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-xml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-api-plugin</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-xml-impl</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> @@ -44,6 +56,14 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> </dependency> + <dependency> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + </dependency> <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.plexus</artifactId> @@ -62,6 +82,12 @@ under the License. <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-api</artifactId> </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml index 3592275fd2..5617329124 100644 --- a/maven-repository-metadata/pom.xml +++ b/maven-repository-metadata/pom.xml @@ -32,6 +32,10 @@ under the License. <description>Per-directory local and remote repository metadata.</description> <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-api-metadata</artifactId> @@ -49,11 +53,21 @@ under the License. <artifactId>maven-xml-impl</artifactId> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-api</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml index f5560f2a90..75ede8e5b0 100644 --- a/maven-resolver-provider/pom.xml +++ b/maven-resolver-provider/pom.xml @@ -32,6 +32,34 @@ under the License. <description>Extensions to Maven Resolver for utilizing Maven POM and repository metadata.</description> <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-xml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-metadata</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-spi</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-model</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-impl</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-xml-impl</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> @@ -81,6 +109,11 @@ under the License. <artifactId>slf4j-api</artifactId> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml index ec37752a28..45adc1ff5f 100644 --- a/maven-settings-builder/pom.xml +++ b/maven-settings-builder/pom.xml @@ -38,6 +38,14 @@ under the License. </contributors> <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-settings</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-core</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-api-impl</artifactId> @@ -58,16 +66,18 @@ under the License. <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-cipher</artifactId> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-interpolation</artifactId> - </dependency> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml index a848e9dc40..b4e4265bda 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -36,6 +36,14 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>maven-api-settings</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-xml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-xml-impl</artifactId> @@ -44,6 +52,14 @@ under the License. <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-xml</artifactId> </dependency> + <dependency> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + </dependency> </dependencies> <build> diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml index 70e93b586c..302e596b67 100644 --- a/maven-slf4j-provider/pom.xml +++ b/maven-slf4j-provider/pom.xml @@ -49,6 +49,17 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>maven-jline</artifactId> </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/maven-slf4j-wrapper/pom.xml b/maven-slf4j-wrapper/pom.xml index 6836a984de..7e3d51615c 100644 --- a/maven-slf4j-wrapper/pom.xml +++ b/maven-slf4j-wrapper/pom.xml @@ -36,5 +36,16 @@ under the License. <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/maven-toolchain-builder/pom.xml b/maven-toolchain-builder/pom.xml index 6554336035..8150462b8a 100644 --- a/maven-toolchain-builder/pom.xml +++ b/maven-toolchain-builder/pom.xml @@ -31,6 +31,14 @@ under the License. <description>The effective toolchain builder.</description> <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-toolchain</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-core</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-api-impl</artifactId> @@ -52,6 +60,17 @@ under the License. <artifactId>javax.inject</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-xml</artifactId> + <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> diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-model/pom.xml index 93016abeac..ba1aa23faf 100644 --- a/maven-toolchain-model/pom.xml +++ b/maven-toolchain-model/pom.xml @@ -37,7 +37,11 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-xml-impl</artifactId> + <artifactId>maven-api-xml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-api-meta</artifactId> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/maven-xml-impl/pom.xml b/maven-xml-impl/pom.xml index eb8b67d887..b0b6124126 100644 --- a/maven-xml-impl/pom.xml +++ b/maven-xml-impl/pom.xml @@ -38,6 +38,10 @@ under the License. <groupId>com.fasterxml.woodstox</groupId> <artifactId>woodstox-core</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + </dependency> <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.plexus</artifactId> @@ -62,6 +66,12 @@ under the License. </exclusion> </exclusions> </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/pom.xml b/pom.xml index e58d847175..59ff88df27 100644 --- a/pom.xml +++ b/pom.xml @@ -511,6 +511,11 @@ under the License. <artifactId>maven-resolver-util</artifactId> <version>${resolverVersion}</version> </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-named-locks</artifactId> + <version>${resolverVersion}</version> + </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-connector-basic</artifactId> @@ -631,7 +636,7 @@ under the License. <!--bootstrap-start-comment--> </dependencyManagement> <!--bootstrap-end-comment--> - <!--bootstrap-start-comment--> + <!-- <dependencies> <dependency> <groupId>org.junit.jupiter</groupId> @@ -644,7 +649,7 @@ under the License. <scope>test</scope> </dependency> </dependencies> - <!--bootstrap-end-comment--> + --> <build> <pluginManagement>