Skip to content

[1.6.x][MRESOLVER-235] Fix dependency management issue #146

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

Closed
wants to merge 5 commits into from
Closed

[1.6.x][MRESOLVER-235] Fix dependency management issue #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87ed935
[MRESOLVER-9] Managed dependencies are not honoured when resolving a …
gnodet Jan 18, 2022
b1c2b8c
Fix ITs mng-4720 and mng-4396
gnodet Jan 18, 2022
e7cdb21
Add a unit test
gnodet Jan 20, 2022
476cea7
Additional fix
gnodet Jan 20, 2022
7a00b30
Add a test for mng4720
gnodet Jan 20, 2022
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
82 changes: 82 additions & 0 deletions ...rc/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;

import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystemSession;
Expand All @@ -48,6 +50,7 @@
import org.eclipse.aether.collection.DependencyCollectionException;
import org.eclipse.aether.collection.DependencyManagement;
import org.eclipse.aether.collection.DependencyManager;
import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.graph.DefaultDependencyNode;
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.DependencyCycle;
Expand All @@ -68,6 +71,10 @@
import org.eclipse.aether.util.graph.manager.DefaultDependencyManager;
import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
import org.eclipse.aether.util.graph.selector.ScopeDependencySelector;
import org.eclipse.aether.util.graph.version.HighestVersionFilter;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -643,4 +650,79 @@ public DependencyManager deriveChildManager( DependencyCollectionContext context

}

@Test
public void testMng4720()
throws Exception
{
session.setDependencySelector(
new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ),
new OptionalDependencySelector(), new ExclusionDependencySelector() ) );
session.setDependencyManager(new ClassicDependencyManager());

CollectRequest request = new CollectRequest().setRoot(newDep("mng4720:test:0.1"));
CollectResult result = collector.collectDependencies(session, request);

assertArtifacts(Arrays.asList(
"mng4720:test:jar:0.1",
"mng4720:a:ext:0.1",
"mng4720:c:ext:0.1",
"mng4720:d:ext:0.1"
), result.getRoot());
}

private void assertArtifacts(Collection<String> expected, DependencyNode node) {
Set<String> artifacts = artifacts(node, new TreeSet<String>());
assertEquals(new TreeSet<>(expected), artifacts);
}

private Set<String> artifacts(DependencyNode root, Set<String> artifacts) {
if (artifacts.add(root.getArtifact().toString())) {
for (DependencyNode c : root.getChildren()) {
artifacts(c, artifacts);
}
}
return artifacts;
}

@Test
public void testMng7003Module1() throws Exception
{
session.setDependencyManager(new ClassicDependencyManager());
CollectRequest request = new CollectRequest().setRoot(newDep("mng7003:module:1"));
CollectResult result = collector.collectDependencies(session, request);
assertArtifacts(Arrays.asList(
"mng7003:module:jar:1",
"mng7003:impl:jar:1",
"mng7003:api:jar:1.7"
), result.getRoot());
}

@Test
public void testMng7003Usage1() throws Exception
{
session.setDependencyManager(new ClassicDependencyManager());
CollectRequest request = new CollectRequest().setRoot(newDep("mng7003:usage:1"));
CollectResult result = collector.collectDependencies(session, request);
assertArtifacts(Arrays.asList(
"mng7003:usage:jar:1",
"mng7003:module:jar:1",
"mng7003:impl:jar:1",
"mng7003:api:jar:1.7"
), result.getRoot());
}

@Test
public void testMng7003Usage2() throws Exception
{
session.setDependencyManager(new ClassicDependencyManager());
CollectRequest request = new CollectRequest().setRoot(newDep("mng7003:usage:2"));
CollectResult result = collector.collectDependencies(session, request);
assertArtifacts(Arrays.asList(
"mng7003:usage:jar:2",
"mng7003:module:jar:1",
"mng7003:impl:jar:1",
"mng7003:api:jar:1.9"
), result.getRoot());
}

}
8 changes: 8 additions & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng4720_a_0.1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[dependencies]
mng4720:b:ext:0.1
mng4720:c:ext:0.1
-mng4720:void

[manageddependencies]
mng4720:c:ext:0.1
-mng4720:d
1 change: 1 addition & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng4720_b_0.1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[dependencies]
2 changes: 2 additions & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng4720_c_0.1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[dependencies]
mng4720:d:ext:0.1
1 change: 1 addition & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng4720_d_0.1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[dependencies]
7 changes: 7 additions & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng4720_test_0.1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[dependencies]
mng4720:a:ext:0.1
-mng4720:void

[manageddependencies]
mng4720:a:ext:0.1
-mng4720:b
1 change: 1 addition & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng7003_api_1.7.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[dependencies]
1 change: 1 addition & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng7003_api_1.8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[dependencies]
1 change: 1 addition & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng7003_api_1.9.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[dependencies]
2 changes: 2 additions & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng7003_impl_1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[dependencies]
mng7003:api:jar:1.8
5 changes: 5 additions & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng7003_module_1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[dependencies]
mng7003:impl:jar:1

[manageddependencies]
mng7003:api:jar:1.7
3 changes: 3 additions & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng7003_usage_1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[dependencies]
mng7003:module:jar:1

5 changes: 5 additions & 0 deletions maven-resolver-impl/src/test/resources/artifact-descriptions/mng7003_usage_2.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[dependencies]
mng7003:module:jar:1

[manageddependencies]
mng7003:api:jar:1.9
10 changes: 0 additions & 10 deletions ...er-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,6 @@ private ClassicDependencyManager( int depth, Map<Object, String> managedVersions

public DependencyManager deriveChildManager( DependencyCollectionContext context )
{
if ( depth >= 2 )
{
return this;
}
else if ( depth == 1 )
{
return new ClassicDependencyManager( depth + 1, managedVersions, managedScopes, managedOptionals,
managedLocalPaths, managedExclusions );
}

Map<Object, String> managedVersions = this.managedVersions;
Map<Object, String> managedScopes = this.managedScopes;
Map<Object, Boolean> managedOptionals = this.managedOptionals;
Expand Down