Skip to content

Fix dependency-reduced-pom exclusion loss for classifier-distinct duplicate deps (Maven 4) #820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ascheman wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −1
Open

Fix dependency-reduced-pom exclusion loss for classifier-distinct duplicate deps (Maven 4) #820

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,15 @@
import org.apache.maven.project.ProjectBuildingResult;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.WriterFactory;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.collection.CollectRequest;
import org.eclipse.aether.collection.CollectResult;
import org.eclipse.aether.collection.DependencyCollectionException;
import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.resolution.ArtifactRequest;
import org.eclipse.aether.resolution.ArtifactResolutionException;
import org.eclipse.aether.util.graph.transformer.ConflictResolver;

import static org.apache.maven.plugins.shade.resource.UseDependencyReducedPom.createPomReplaceTransformers;

Expand Down Expand Up @@ -1299,7 +1301,15 @@ public boolean updateExcludesInDeps(
d, session.getRepositorySession().getArtifactTypeRegistry()))
.collect(Collectors.toList()));
}
CollectResult result = repositorySystem.collectDependencies(session.getRepositorySession(), collectRequest);
// #819: collect with verbose conflict resolution so that dependencies omitted as conflict
// losers (e.g. a transitive dependency shared by two classifier-distinct variants of the same
// artifact) are retained in the graph as markers. Without this, conflict resolution under Maven 4
// prunes the duplicate node from all but one variant, and the exclusion is only applied to that
// single variant in the dependency-reduced-pom.
DefaultRepositorySystemSession verboseSession =
new DefaultRepositorySystemSession(session.getRepositorySession());
verboseSession.setConfigProperty(ConflictResolver.CONFIG_PROP_VERBOSE, ConflictResolver.Verbosity.STANDARD);
CollectResult result = repositorySystem.collectDependencies(verboseSession, collectRequest);
boolean modified = false;
if (result.getRoot() != null) {
for (DependencyNode n2 : result.getRoot().getChildren()) {
Expand Down
Loading