From f2c669a00c6c566f9bee110f48372bc0fae25d7a Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Mon, 4 May 2026 23:38:20 +0200 Subject: [PATCH] Resolve plugins declared in pluginManagement for resolve-plugins and go-offline Parent POMs can declare plugin versions only in pluginManagement. Such plugins should also be taken into account during resolution. --- src/it/projects/resolve-plugins/pom.xml | 5 ++++ src/it/projects/resolve-plugins/verify.groovy | 27 +++++++++++++++++++ .../dependency/utils/ResolverUtil.java | 8 +++++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/it/projects/resolve-plugins/verify.groovy diff --git a/src/it/projects/resolve-plugins/pom.xml b/src/it/projects/resolve-plugins/pom.xml index c0df89152..afd3539f8 100644 --- a/src/it/projects/resolve-plugins/pom.xml +++ b/src/it/projects/resolve-plugins/pom.xml @@ -44,6 +44,11 @@ maven-assembly-plugin 3.7.1 + + org.apache.maven.plugins + maven-dependency-plugin + 3.10.0 + org.apache.maven.plugins maven-surefire-plugin diff --git a/src/it/projects/resolve-plugins/verify.groovy b/src/it/projects/resolve-plugins/verify.groovy new file mode 100644 index 000000000..f6b56e86e --- /dev/null +++ b/src/it/projects/resolve-plugins/verify.groovy @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +def resolvedPlugins = new File(basedir, "target/resolved.txt").text + +assert resolvedPlugins.contains(" org.apache.maven.plugins:maven-assembly-plugin:jar:") : "Expected plugin not found in resolved plugins" +assert resolvedPlugins.contains(" org.apache.maven.plugins:maven-dependency-plugin:jar:") : "Expected plugin not found in resolved plugins" +assert resolvedPlugins.contains(" org.apache.maven.plugins:maven-surefire-plugin:jar:") : "Expected plugin not found in resolved plugins" +assert resolvedPlugins.contains(" org.apache.maven.plugins:maven-project-info-reports-plugin:jar:") : "Expected plugin not found in resolved plugins" +assert resolvedPlugins.contains(" org.apache.maven.plugins:maven-failsafe-plugin:jar:") : "Expected plugin not found in resolved plugins" +assert resolvedPlugins.contains(" org.apache.maven.plugins:maven-surefire-report-plugin:jar:") : "Expected plugin not found in resolved plugins" diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/ResolverUtil.java b/src/main/java/org/apache/maven/plugins/dependency/utils/ResolverUtil.java index 27e56e91b..e135b47a3 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/utils/ResolverUtil.java +++ b/src/main/java/org/apache/maven/plugins/dependency/utils/ResolverUtil.java @@ -38,6 +38,7 @@ import org.apache.maven.model.ModelBase; import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginContainer; +import org.apache.maven.model.PluginManagement; import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.Reporting; import org.apache.maven.project.MavenProject; @@ -342,7 +343,7 @@ private ArtifactType getArtifactType(String packaging) { } /** - * Retrieve all plugins used in project either in build or reporting section. + * Retrieve all plugins used in a project either in the build, plugin management, or reporting section. * * @param project a maven project * @return a collection of plugins @@ -358,9 +359,14 @@ public Collection getProjectPlugins(MavenProject project) { List projectPlugins = project.getBuild().getPlugins(); + List managementPlugins = Optional.ofNullable(project.getPluginManagement()) + .map(PluginManagement::getPlugins) + .orElse(Collections.emptyList()); + LinkedHashSet result = new LinkedHashSet<>(reportPlugins.size() + projectPlugins.size()); result.addAll(reportPlugins); result.addAll(projectPlugins); + result.addAll(managementPlugins); return result; }