From da903c0a112553dba6dc15e2ec45fdd31ac01cd4 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Wed, 15 Oct 2025 21:34:22 +0200 Subject: [PATCH] Cleanups dependencies - apply dependency:analyzer - manage provide scope for Maven core artifacts - remove not used or not needed dependencies (cherry picked from commit 843d22e3b83eb4bbfa9c28663d73aa52197a22a7) --- maven-plugin-plugin/pom.xml | 10 ++---- .../plugin/DescriptorGeneratorMojoTest.java | 5 ++- maven-plugin-report-plugin/pom.xml | 26 +++----------- .../EnhancedPluginDescriptorBuilder.java | 3 +- maven-plugin-tools-annotations/pom.xml | 31 +++++------------ .../DefaultMojoAnnotationsScannerTest.java | 3 +- maven-plugin-tools-api/pom.xml | 8 ++--- .../tools/plugin/javadoc/JavadocSiteTest.java | 8 ++--- .../plugin/util/stubs/MavenReportStub.java | 20 ----------- maven-plugin-tools-generators/pom.xml | 9 ++--- .../PluginDescriptorFilesGeneratorTest.java | 2 -- maven-plugin-tools-java/pom.xml | 2 +- maven-script/maven-plugin-tools-ant/pom.xml | 16 ++++++++- .../maven-plugin-tools-beanshell/pom.xml | 6 ++++ maven-script/maven-plugin-tools-model/pom.xml | 2 +- maven-script/maven-script-ant/pom.xml | 2 +- pom.xml | 34 ++++++++++++------- 17 files changed, 74 insertions(+), 113 deletions(-) diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml index dfbbaba10..6b36366e9 100644 --- a/maven-plugin-plugin/pom.xml +++ b/maven-plugin-plugin/pom.xml @@ -101,7 +101,6 @@ org.apache.maven maven-model - provided org.apache.maven @@ -122,13 +121,10 @@ org.apache.maven.resolver maven-resolver-api - ${resolverVersion} - provided org.apache.maven.resolver maven-resolver-util - ${resolverVersion} javax.inject @@ -162,12 +158,12 @@ org.junit.jupiter - junit-jupiter + junit-jupiter-api test - org.hamcrest - hamcrest + org.junit.jupiter + junit-jupiter-params test diff --git a/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java b/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java index 4956340ea..77f2933c4 100644 --- a/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java +++ b/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java @@ -25,8 +25,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.params.provider.Arguments.arguments; // at least one test class must be public for test-javadoc report @@ -42,7 +41,7 @@ public static Stream goalPrefixes() { @ParameterizedTest @MethodSource("goalPrefixes") void defaultGoalPrefix(String groupId, String artifactId, String expectedGoal) { - assertThat(DescriptorGeneratorMojo.getDefaultGoalPrefix(newProject(groupId, artifactId)), is(expectedGoal)); + assertEquals(expectedGoal, DescriptorGeneratorMojo.getDefaultGoalPrefix(newProject(groupId, artifactId))); } private MavenProject newProject(final String groupId, final String artifactId) { diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml index 0b9e3a72b..a78450d96 100644 --- a/maven-plugin-report-plugin/pom.xml +++ b/maven-plugin-report-plugin/pom.xml @@ -47,12 +47,10 @@ org.apache.maven maven-core - provided org.apache.maven maven-plugin-api - provided org.apache.maven.reporting @@ -61,28 +59,18 @@ org.apache.maven maven-model-builder - provided org.apache.maven maven-model - provided org.apache.maven maven-artifact - provided - - - org.apache.maven - maven-settings - provided org.apache.maven.resolver maven-resolver-api - ${resolverVersion} - provided @@ -94,10 +82,6 @@ org.apache.maven.plugin-tools maven-plugin-tools-api - - org.apache.maven.plugin-tools - maven-plugin-tools-generators - @@ -132,6 +116,11 @@ plexus-i18n 1.0.0 + + org.eclipse.sisu + org.eclipse.sisu.plexus + provided + @@ -139,11 +128,6 @@ junit-jupiter-api test - - org.junit.jupiter - junit-jupiter - test - org.apache.maven.plugins diff --git a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilder.java b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilder.java index b14e94332..17bc30bbd 100644 --- a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilder.java +++ b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilder.java @@ -35,13 +35,12 @@ import org.apache.maven.rtinfo.RuntimeInformation; import org.apache.maven.tools.plugin.EnhancedParameterWrapper; import org.apache.maven.tools.plugin.ExtendedPluginDescriptor; -import org.apache.maven.tools.plugin.generator.PluginDescriptorFilesGenerator; import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.PlexusConfigurationException; /** * Reads enhanced plugin.xml files as generated by - * {@link PluginDescriptorFilesGenerator} and used by {@link PluginReport}. + * {@code PluginDescriptorFilesGenerator} and used by {@link PluginReport}. * Populates the slightly extended {@link Parameter} object {@link EnhancedParameterWrapper}. * In addition populates all (optional) elements added after Maven Plugin API 3.2.5. */ diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml index 996c13a1c..37414eaae 100644 --- a/maven-plugin-tools-annotations/pom.xml +++ b/maven-plugin-tools-annotations/pom.xml @@ -68,7 +68,6 @@ org.apache.maven.resolver maven-resolver-api - ${resolverVersion} org.slf4j @@ -78,11 +77,6 @@ org.codehaus.plexus plexus-utils - - org.eclipse.sisu - org.eclipse.sisu.plexus - compile - org.codehaus.plexus plexus-archiver @@ -111,24 +105,11 @@ com.thoughtworks.qdox qdox - - org.mockito - mockito-core - test - - - org.junit.jupiter - junit-jupiter-engine - test - + + org.junit.jupiter - junit-jupiter-params - test - - - org.codehaus.plexus - plexus-testing + junit-jupiter-api test @@ -147,6 +128,12 @@ slf4j-simple test + + + org.codehaus.plexus + plexus-xml + test + diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java index 0cf474029..a0f7b6b06 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java @@ -40,7 +40,6 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.codehaus.plexus.testing.PlexusExtension.getBasedir; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -132,7 +131,7 @@ void scanParametersWithGenerics() throws ExtractionException, IOException { @Test void scanFooMojoClass() throws Exception { MojoAnnotationsScannerRequest request = new MojoAnnotationsScannerRequest(); - request.setClassesDirectories(Collections.singletonList(new File(getBasedir(), "target/test-classes"))); + request.setClassesDirectories(Collections.singletonList(new File("target/test-classes"))); request.setIncludePatterns(Arrays.asList("**/FooMojo.class")); request.setProject(new MavenProject()); diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml index 8cbdb2757..6097379ac 100644 --- a/maven-plugin-tools-api/pom.xml +++ b/maven-plugin-tools-api/pom.xml @@ -70,16 +70,12 @@ org.apache.maven.resolver maven-resolver-api - ${resolverVersion} org.codehaus.plexus plexus-classworlds 2.9.0 - - - org.eclipse.sisu - org.eclipse.sisu.plexus + provided @@ -116,7 +112,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api test diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteTest.java index 05303b84f..4355fb82f 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteTest.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteTest.java @@ -32,10 +32,10 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentest4j.AssertionFailedError; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests against the locally available javadoc sites. Doesn't require internet connectivity. @@ -150,12 +150,12 @@ static void assertUrlValid(final URI url) { if (url.getFragment() != null) { Pattern pattern = JavadocSite.getAnchorPattern(url.getFragment()); if (!reader.lines().anyMatch(pattern.asPredicate())) { - throw new AssertionFailedError("Although URL " + url + " exists, no line matching the pattern " - + pattern + " found in response"); + fail("Although URL " + url + " exists, no line matching the pattern " + pattern + + " found in response"); } } } catch (IOException e) { - throw new AssertionFailedError("Could not find URL " + url, e); + fail("Could not find URL " + url, e); } } } diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/stubs/MavenReportStub.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/stubs/MavenReportStub.java index 0358de025..ae7e78174 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/stubs/MavenReportStub.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/stubs/MavenReportStub.java @@ -20,8 +20,6 @@ import java.util.Locale; -import org.apache.maven.doxia.siterenderer.Renderer; -import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.AbstractMavenReport; import org.apache.maven.reporting.MavenReportException; @@ -33,24 +31,6 @@ public class MavenReportStub extends AbstractMavenReport { @Override protected void executeReport(Locale locale) throws MavenReportException {} - /** {@inheritDoc} */ - @Override - protected String getOutputDirectory() { - return null; - } - - /** {@inheritDoc} */ - @Override - protected MavenProject getProject() { - return null; - } - - /** {@inheritDoc} */ - @Override - protected Renderer getSiteRenderer() { - return null; - } - /** {@inheritDoc} */ @Override public String getDescription(Locale locale) { diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml index e96cee79d..677f40d4e 100644 --- a/maven-plugin-tools-generators/pom.xml +++ b/maven-plugin-tools-generators/pom.xml @@ -76,6 +76,7 @@ org.eclipse.sisu org.eclipse.sisu.plexus + provided @@ -86,7 +87,6 @@ org.slf4j slf4j-api - ${slf4jVersion} @@ -105,12 +105,7 @@ org.junit.jupiter - junit-jupiter-engine - test - - - org.codehaus.plexus - plexus-testing + junit-jupiter-api test diff --git a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java index eb35539e4..45bc602f4 100644 --- a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java +++ b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java @@ -36,7 +36,6 @@ import org.apache.maven.tools.plugin.javadoc.JavadocLinkGenerator; import org.codehaus.plexus.component.repository.ComponentDependency; import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.testing.PlexusTest; import org.codehaus.plexus.util.ReaderFactory; import org.junit.jupiter.api.Test; @@ -47,7 +46,6 @@ /** * @author Jason van Zyl */ -@PlexusTest public class PluginDescriptorFilesGeneratorTest extends AbstractGeneratorTestCase { @Override protected void extendPluginDescriptor(PluginDescriptor pluginDescriptor) throws DuplicateParameterException { diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml index c3d00bb2a..f0a7e6120 100644 --- a/maven-plugin-tools-java/pom.xml +++ b/maven-plugin-tools-java/pom.xml @@ -87,7 +87,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api test diff --git a/maven-script/maven-plugin-tools-ant/pom.xml b/maven-script/maven-plugin-tools-ant/pom.xml index 4a9b11447..0e62f67bf 100644 --- a/maven-script/maven-plugin-tools-ant/pom.xml +++ b/maven-script/maven-plugin-tools-ant/pom.xml @@ -33,6 +33,14 @@ + + org.apache.maven + maven-plugin-api + + + org.apache.maven + maven-core + org.apache.maven.plugin-tools maven-plugin-tools-api @@ -41,9 +49,15 @@ org.apache.maven.plugin-tools maven-plugin-tools-model + + javax.inject + javax.inject + 1 + provided + org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api test diff --git a/maven-script/maven-plugin-tools-beanshell/pom.xml b/maven-script/maven-plugin-tools-beanshell/pom.xml index 459533582..2b6931588 100644 --- a/maven-script/maven-plugin-tools-beanshell/pom.xml +++ b/maven-script/maven-plugin-tools-beanshell/pom.xml @@ -41,6 +41,12 @@ org.apache.maven maven-plugin-api + + javax.inject + javax.inject + 1 + provided + diff --git a/maven-script/maven-plugin-tools-model/pom.xml b/maven-script/maven-plugin-tools-model/pom.xml index c504c0165..867d6f00d 100644 --- a/maven-script/maven-plugin-tools-model/pom.xml +++ b/maven-script/maven-plugin-tools-model/pom.xml @@ -48,7 +48,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api test diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml index deb6ea5f1..3e435abb8 100644 --- a/maven-script/maven-script-ant/pom.xml +++ b/maven-script/maven-script-ant/pom.xml @@ -84,7 +84,7 @@ under the License. org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api test diff --git a/pom.xml b/pom.xml index 973c3347a..33916306d 100644 --- a/pom.xml +++ b/pom.xml @@ -166,32 +166,50 @@ org.apache.maven maven-model-builder ${maven3Version} + provided org.apache.maven maven-model ${maven3Version} + provided org.apache.maven maven-plugin-api ${maven3Version} + provided org.apache.maven maven-core ${maven3Version} + provided org.apache.maven maven-artifact ${maven3Version} + provided org.apache.maven maven-settings ${maven3Version} + provided + + org.apache.maven.resolver + maven-resolver-api + ${resolverVersion} + provided + + + org.apache.maven.resolver + maven-resolver-util + ${resolverVersion} + + org.apache.maven.reporting @@ -208,6 +226,7 @@ org.slf4j slf4j-api ${slf4jVersion} + provided org.slf4j @@ -259,11 +278,6 @@ asm ${asmVersion} - - org.ow2.asm - asm-commons - ${asmVersion} - org.ow2.asm asm-util @@ -291,22 +305,16 @@ org.mockito mockito-core - 3.12.4 + 4.11.0 test org.junit junit-bom - 5.11.3 + 5.14.0 pom import - - org.codehaus.plexus - plexus-testing - 1.6.1 - test -