You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by "wilx (via GitHub)" <gi...@apache.org> on 2026/07/27 17:51:08 UTC
[PR] [MASSEMBLY-948] Resolve module dependencies with Maven Resolver [maven-assembly-plugin]
wilx opened a new pull request, #1339:
URL: https://github.com/apache/maven-assembly-plugin/pull/1339
Fixes #1158.
## Summary
Replace the deprecated `MavenProject.getDependencyArtifacts()` lookup used by
module-set dependency resolution with Maven Resolver.
This prevents a `NullPointerException` for reactor modules where Maven does not
populate the legacy dependency-artifact collection, including `pom`-packaging
projects. It also preserves the intended `useTransitiveDependencies` behavior:
direct reactor dependencies are included when the option is disabled, while
their transitive dependencies are omitted.
## Implementation
- Resolve module dependencies from the project's dependency graph through
Maven Resolver.
- Select only depth-one dependency nodes for non-transitive module sets.
- Account for the dependency-node parent-list shapes used by Maven Resolver
1.x and 2.x.
- Add unit coverage for missing legacy dependency artifacts and direct
dependency selection.
- Add an Invoker reproducer with a multi-module reactor containing a
`pom`-packaging module, and verify the exact archive contents.
## Compatibility and verification
- Maven 3.9.16: `mvn -Prun-its clean verify` passed (269 unit tests and 151
Invoker builds).
- Maven 4.0.0-rc-5: `mvn clean verify` passed (269 unit tests).
- The processed regression project was also run directly with Maven 4.0.0-rc-5
and Maven 3.6.3; both produced the expected direct-dependency-only archive.
The Maven 4 outer Invoker run is currently affected by Maven Invoker 3.10.1
passing `-D maven.repo.local=...` as two arguments, which Maven 4 rejects. This
is independent of the plugin change; the same processed integration-test
project passes when Maven receives the correctly formed
`-Dmaven.repo.local=...` argument.
Following this checklist to help us incorporate your
contribution quickly and easily:
- [x] Your pull request should address just one issue, without pulling in other changes.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Each commit in the pull request should have a meaningful subject line and body.
Note that commits might be squashed by a maintainer on merge.
- [x] Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied.
This may not always be possible but is a best-practice.
- [x] Run `mvn verify` to make sure basic checks pass.
A more thorough check will be performed on your pull request automatically.
- [x] You have run the integration tests successfully (`mvn -Prun-its verify`).
If your pull request is about ~20 lines of code you don't need to sign an
[Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf) if you are unsure
please ask on the developers list.
To make clear that you license your contribution under
the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
you have to acknowledge this by using the following check-box.
- [x] I hereby declare this contribution to be licenced under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
- [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [MASSEMBLY-948] Resolve module dependencies with Maven Resolver [maven-assembly-plugin]
Posted by "wilx (via GitHub)" <gi...@apache.org>.
wilx commented on code in PR #1339:
URL: https://github.com/apache/maven-assembly-plugin/pull/1339#discussion_r3833156092
##########
src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java:
##########
@@ -113,21 +116,56 @@ void getDependencySetResolutionRequirementsTransitive() throws Exception {
@Test
void getDependencySetResolutionRequirementsNonTransitive() throws Exception {
final DependencySet ds = new DependencySet();
- ds.setScope(Artifact.SCOPE_SYSTEM);
+ ds.setScope(Artifact.SCOPE_RUNTIME);
ds.setUseTransitiveDependencies(false);
final MavenProject project = createMavenProject("main-group", "main-artifact", "1", null);
- Set<Artifact> dependencyArtifacts = new HashSet<>();
- dependencyArtifacts.add(newArtifact("g.id", "a-id", "1"));
- Set<Artifact> artifacts = new HashSet<>(dependencyArtifacts);
- artifacts.add(newArtifact("g.id", "a-id-2", "2"));
- project.setArtifacts(artifacts);
- project.setDependencyArtifacts(dependencyArtifacts);
+ Artifact directArtifact = newArtifact("g.id", "direct", "1");
+ DefaultDependencyNode directNode = new DefaultDependencyNode(new Dependency(
+ new org.eclipse.aether.artifact.DefaultArtifact("g.id:direct:1").setFile(new File(".")), "runtime"));
+ DefaultDependencyNode transitiveNode = new DefaultDependencyNode(new Dependency(
+ new org.eclipse.aether.artifact.DefaultArtifact("g.id:transitive:1").setFile(new File(".")),
+ "runtime"));
+ directNode.setChildren(Collections.singletonList(transitiveNode));
+
+ DependencyResult dependencyResult = new DependencyResult(new DependencyRequest());
+ DefaultDependencyNode rootDependencyNode = new DefaultDependencyNode((Dependency) null);
+ rootDependencyNode.setChildren(Collections.singletonList(directNode));
+ dependencyResult.setRoot(rootDependencyNode);
+
+ when(repositorySystem.resolveDependencies(eq(systemSession), any())).thenReturn(dependencyResult);
final ResolutionManagementInfo info = new ResolutionManagementInfo();
resolver.updateDependencySetResolutionRequirements(systemSession, ds, info, project);
- assertEquals(dependencyArtifacts, info.getArtifacts());
+ assertEquals(Collections.singleton(directArtifact), info.getArtifacts());
+
+ ArgumentCaptor<DependencyRequest> requestCaptor = ArgumentCaptor.forClass(DependencyRequest.class);
+ verify(repositorySystem).resolveDependencies(eq(systemSession), requestCaptor.capture());
+ DependencyFilter filter = requestCaptor.getValue().getFilter();
+
+ assertTrue(filter.accept(directNode, Collections.singletonList(rootDependencyNode)));
+ assertTrue(filter.accept(directNode, Arrays.asList(directNode, rootDependencyNode)));
+ assertFalse(filter.accept(transitiveNode, Arrays.asList(directNode, rootDependencyNode)));
+ assertFalse(filter.accept(transitiveNode, Arrays.asList(transitiveNode, directNode, rootDependencyNode)));
+ }
+
+ @Test
+ void getDependencySetResolutionRequirementsNonTransitiveWithoutDependencies() throws Exception {
+ final DependencySet ds = new DependencySet();
+ ds.setScope(Artifact.SCOPE_SYSTEM);
+ ds.setUseTransitiveDependencies(false);
+
+ final MavenProject project = createMavenProject("main-group", "empty-pom", "1", null);
+ project.setDependencyArtifacts(null);
Review Comment:
I have removed the call.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [MASSEMBLY-948] Resolve module dependencies with Maven Resolver [maven-assembly-plugin]
Posted by "elharo (via GitHub)" <gi...@apache.org>.
elharo commented on code in PR #1339:
URL: https://github.com/apache/maven-assembly-plugin/pull/1339#discussion_r3719919487
##########
src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java:
##########
@@ -113,21 +116,56 @@ void getDependencySetResolutionRequirementsTransitive() throws Exception {
@Test
void getDependencySetResolutionRequirementsNonTransitive() throws Exception {
final DependencySet ds = new DependencySet();
- ds.setScope(Artifact.SCOPE_SYSTEM);
+ ds.setScope(Artifact.SCOPE_RUNTIME);
ds.setUseTransitiveDependencies(false);
final MavenProject project = createMavenProject("main-group", "main-artifact", "1", null);
- Set<Artifact> dependencyArtifacts = new HashSet<>();
- dependencyArtifacts.add(newArtifact("g.id", "a-id", "1"));
- Set<Artifact> artifacts = new HashSet<>(dependencyArtifacts);
- artifacts.add(newArtifact("g.id", "a-id-2", "2"));
- project.setArtifacts(artifacts);
- project.setDependencyArtifacts(dependencyArtifacts);
+ Artifact directArtifact = newArtifact("g.id", "direct", "1");
+ DefaultDependencyNode directNode = new DefaultDependencyNode(new Dependency(
+ new org.eclipse.aether.artifact.DefaultArtifact("g.id:direct:1").setFile(new File(".")), "runtime"));
+ DefaultDependencyNode transitiveNode = new DefaultDependencyNode(new Dependency(
+ new org.eclipse.aether.artifact.DefaultArtifact("g.id:transitive:1").setFile(new File(".")),
+ "runtime"));
+ directNode.setChildren(Collections.singletonList(transitiveNode));
+
+ DependencyResult dependencyResult = new DependencyResult(new DependencyRequest());
+ DefaultDependencyNode rootDependencyNode = new DefaultDependencyNode((Dependency) null);
+ rootDependencyNode.setChildren(Collections.singletonList(directNode));
+ dependencyResult.setRoot(rootDependencyNode);
+
+ when(repositorySystem.resolveDependencies(eq(systemSession), any())).thenReturn(dependencyResult);
final ResolutionManagementInfo info = new ResolutionManagementInfo();
resolver.updateDependencySetResolutionRequirements(systemSession, ds, info, project);
- assertEquals(dependencyArtifacts, info.getArtifacts());
+ assertEquals(Collections.singleton(directArtifact), info.getArtifacts());
+
+ ArgumentCaptor<DependencyRequest> requestCaptor = ArgumentCaptor.forClass(DependencyRequest.class);
+ verify(repositorySystem).resolveDependencies(eq(systemSession), requestCaptor.capture());
+ DependencyFilter filter = requestCaptor.getValue().getFilter();
+
+ assertTrue(filter.accept(directNode, Collections.singletonList(rootDependencyNode)));
+ assertTrue(filter.accept(directNode, Arrays.asList(directNode, rootDependencyNode)));
+ assertFalse(filter.accept(transitiveNode, Arrays.asList(directNode, rootDependencyNode)));
+ assertFalse(filter.accept(transitiveNode, Arrays.asList(transitiveNode, directNode, rootDependencyNode)));
+ }
+
+ @Test
+ void getDependencySetResolutionRequirementsNonTransitiveWithoutDependencies() throws Exception {
+ final DependencySet ds = new DependencySet();
+ ds.setScope(Artifact.SCOPE_SYSTEM);
+ ds.setUseTransitiveDependencies(false);
+
+ final MavenProject project = createMavenProject("main-group", "empty-pom", "1", null);
+ project.setDependencyArtifacts(null);
Review Comment:
anyway to avoid adding a new call to this deprecated method?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org