This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MPLUGIN-526 in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 3bac2ea3bd7505d31efe5ae17eb547be1ce95095 Author: Michael Osipov <micha...@apache.org> AuthorDate: Sun May 26 14:38:52 2024 +0200 [MPLUGIN-526] Clean up dependencies reported by dependencies:analyze This closes #287 --- maven-plugin-plugin/pom.xml | 17 ++++++++++++++ maven-plugin-report-plugin/pom.xml | 24 +++++++++++++++---- maven-plugin-tools-annotations/pom.xml | 21 +++++++++++++++++ maven-plugin-tools-api/pom.xml | 26 +++++++++++++++++++- maven-plugin-tools-generators/pom.xml | 34 +++++++++++++++++++++------ maven-plugin-tools-java/pom.xml | 31 +++++++++++++++++++----- maven-script/maven-plugin-tools-model/pom.xml | 4 ++++ pom.xml | 6 +++++ 8 files changed, 145 insertions(+), 18 deletions(-) diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml index 465d41f2..6747c627 100644 --- a/maven-plugin-plugin/pom.xml +++ b/maven-plugin-plugin/pom.xml @@ -103,6 +103,11 @@ <artifactId>maven-model</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-repository-metadata</artifactId> @@ -114,6 +119,18 @@ <artifactId>maven-artifact</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + <version>${resolverVersion}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> + <version>${resolverVersion}</version> + <scope>provided</scope> + </dependency> <!-- plexus --> <dependency> diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml index d023ad27..38f79e40 100644 --- a/maven-plugin-report-plugin/pom.xml +++ b/maven-plugin-report-plugin/pom.xml @@ -39,6 +39,7 @@ <properties> <it.debug>true</it.debug> + <doxiaVersion>1.11.1</doxiaVersion> </properties> <dependencies> @@ -57,6 +58,11 @@ <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model-builder</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> @@ -67,6 +73,12 @@ <artifactId>maven-artifact</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + <version>${resolverVersion}</version> + <scope>provided</scope> + </dependency> <!-- plugin tools --> <dependency> @@ -86,7 +98,12 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-sink-api</artifactId> - <version>1.11.1</version> + <version>${doxiaVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxiaVersion}</version> </dependency> <!-- shared --> @@ -101,12 +118,11 @@ <version>3.8.1</version> <!--same version as used by doxia site renderer --> </dependency> - <!-- plexus --> + <!-- Plexus --> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> + <artifactId>plexus-xml</artifactId> </dependency> - <!-- Plexus --> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml index 9a66a25f..9423b4df 100644 --- a/maven-plugin-tools-annotations/pom.xml +++ b/maven-plugin-tools-annotations/pom.xml @@ -48,6 +48,10 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-api</artifactId> @@ -56,6 +60,11 @@ <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + <version>${resolverVersion}</version> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -73,6 +82,12 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-archiver</artifactId> </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.ow2.asm</groupId> @@ -111,6 +126,12 @@ <artifactId>plexus-testing</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>1.11.13</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml index 21f4c209..0800051b 100644 --- a/maven-plugin-tools-api/pom.xml +++ b/maven-plugin-tools-api/pom.xml @@ -57,6 +57,30 @@ <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + <version>${resolverVersion}</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-classworlds</artifactId> + <version>2.7.0</version> + </dependency> + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + </dependency> <!-- plexus --> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -81,7 +105,7 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-provider-api</artifactId> - <version>2.4</version> + <version>3.5.3</version> </dependency> <!-- for parsing java/javadoc versions --> <dependency> diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml index e2ca5627..e262d1c3 100644 --- a/maven-plugin-tools-generators/pom.xml +++ b/maven-plugin-tools-generators/pom.xml @@ -43,30 +43,50 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </dependency> <!-- plexus --> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-xml</artifactId> + </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> </dependency> + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + </dependency> <!-- other --> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-commons</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> </dependency> <!-- for HTML to plain text conversion --> diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml index 7c0cc293..0534a4ec 100644 --- a/maven-plugin-tools-java/pom.xml +++ b/maven-plugin-tools-java/pom.xml @@ -41,7 +41,15 @@ <!-- maven --> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> + <artifactId>maven-artifact</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -49,14 +57,9 @@ </dependency> <!-- plexus --> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.plexus</artifactId> - <scope>compile</scope> </dependency> <!-- misc --> @@ -64,8 +67,24 @@ <groupId>com.thoughtworks.qdox</groupId> <artifactId>qdox</artifactId> </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + <scope>provided</scope> + </dependency> <!-- test --> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> diff --git a/maven-script/maven-plugin-tools-model/pom.xml b/maven-script/maven-plugin-tools-model/pom.xml index cb9b3c80..ad1b5028 100644 --- a/maven-script/maven-plugin-tools-model/pom.xml +++ b/maven-script/maven-plugin-tools-model/pom.xml @@ -46,6 +46,10 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-xml</artifactId> </dependency> + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> diff --git a/pom.xml b/pom.xml index b0750122..025552e4 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,7 @@ <pluginTestingHarnessVersion>3.3.0</pluginTestingHarnessVersion> <maven4Version>4.0.0-alpha-4</maven4Version> <maven3Version>3.9.6</maven3Version> + <resolverVersion>1.9.18</resolverVersion> <slf4jVersion>1.7.36</slf4jVersion> <antVersion>1.10.14</antVersion> <maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path> @@ -158,6 +159,11 @@ <artifactId>maven-plugin-plugin</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model-builder</artifactId> + <version>${maven3Version}</version> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId>