You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/06/08 21:54:28 UTC
[maven-resolver] branch MRESOLVER-8+9+12 created (now 3efd68c)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MRESOLVER-8+9+12
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git.
at 3efd68c [MRESOLVER-12] Addition of unit tests for the various DependencySelector implementations to test things are working as documented.
This branch includes the following new commits:
new 3d4abdb [MRESOLVER-8] ScopeDependencySelector incorrectly de-selects direct dependencies
new 55a9517 [MRESOLVER-9] DefaultDependencyCollector does not correctly handle dependency management
new 3efd68c [MRESOLVER-12] Addition of unit tests for the various DependencySelector implementations to test things are working as documented.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-resolver] 03/03: [MRESOLVER-12] Addition of unit tests for
the various DependencySelector implementations to test things are working
as documented.
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRESOLVER-8+9+12
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 3efd68ccffd73e869c3600eeb55675b66b6ff6bb
Author: Christian Schulte <cs...@schulte.it>
AuthorDate: Sun Oct 22 05:15:43 2017 +0200
[MRESOLVER-12] Addition of unit tests for the various DependencySelector implementations to test things are working as documented.
---
.../collect/DefaultDependencyCollectorTest.java | 266 +++++++++++++++++++++
.../selection/managed/all-nodes.txt | 4 +
.../selection/managed/direct-of-root.txt | 1 +
.../selection/managed/gid_direct-of-root_ver.ini | 2 +
.../selection/managed/gid_root_ver.ini | 2 +
.../managed/gid_transitive-of-root_ver.ini | 2 +
.../gid_transitive-of-transitive-of-root_ver.ini | 1 +
.../selection/managed/transitive-of-root.txt | 2 +
.../managed/transitive-of-transitive-of-root.txt | 3 +
.../selection/optional/all-nodes.txt | 4 +
.../selection/optional/gid_direct_ver.ini | 2 +
.../selection/optional/gid_root_ver.ini | 2 +
.../selection/optional/gid_transitive-1_ver.ini | 2 +
.../selection/optional/gid_transitive-2_ver.ini | 1 +
.../optional-transitive-exclusion-tree.txt | 2 +
.../selection/scope/all-nodes.txt | 4 +
.../selection/scope/gid_direct_ver.ini | 2 +
.../selection/scope/gid_root_ver.ini | 2 +
.../selection/scope/gid_transitive-1_ver.ini | 2 +
.../selection/scope/gid_transitive-2_ver.ini | 1 +
.../scope/transitive-1-exclusion-tree.txt | 2 +
.../scope/transitive-2-exclusion-tree.txt | 3 +
22 files changed, 312 insertions(+)
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
index d4a0ee0..5beb502 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
@@ -48,6 +48,7 @@ import org.eclipse.aether.collection.DependencyCollectionContext;
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;
@@ -68,6 +69,7 @@ import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
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.OptionalDependencySelector;
import org.eclipse.aether.util.graph.selector.ScopeDependencySelector;
import org.eclipse.aether.util.graph.version.HighestVersionFilter;
import org.junit.Before;
@@ -389,12 +391,14 @@ public class DefaultDependencyCollectorTest
collector.setArtifactDescriptorReader( new ArtifactDescriptorReader()
{
+
public ArtifactDescriptorResult readArtifactDescriptor( RepositorySystemSession session,
ArtifactDescriptorRequest request )
{
repos.addAll( request.getRepositories() );
return new ArtifactDescriptorResult( request );
}
+
} );
List<Dependency> dependencies = Arrays.asList( newDep( "verrange:parent:jar:1[1,)", "compile" ) );
@@ -541,6 +545,268 @@ public class DefaultDependencyCollectorTest
assertEqualSubtree( expectedTree, toDependencyResult( result.getRoot(), "compile", null ) );
}
+ @Test
+ public void testDependencyManagement_DependencySelectorProcessesManagedState()
+ throws DependencyCollectionException, IOException
+ {
+ collector.setArtifactDescriptorReader( newReader( "selection/managed/" ) );
+ parser = new DependencyGraphParser( "artifact-descriptions/selection/managed/" );
+
+ final Dependency root = newDep( "gid:root:ext:ver", "root-scope" );
+ CollectRequest request = new CollectRequest( root, Arrays.asList( repository ) );
+ CollectResult result = collector.collectDependencies( session, request );
+
+ DependencyNode expected = parser.parseResource( "all-nodes.txt" );
+ assertEqualSubtree( expected, result.getRoot() );
+
+ this.session.setDependencySelector( new DependencySelector()
+ {
+
+ public boolean selectDependency( final Dependency dependency )
+ {
+ return dependency != null
+ && !( "managed".equals( dependency.getScope() )
+ || "managed".equals( dependency.getArtifact().getVersion() )
+ || dependency.isOptional() );
+
+ }
+
+ public DependencySelector deriveChildSelector( final DependencyCollectionContext context )
+ {
+ return this;
+ }
+
+ } );
+
+ // Tests managed scope is processed by selector.
+ TestDependencyManager depMgmt = new TestDependencyManager();
+ depMgmt.scope( "gid:transitive-of-transitive-of-root:ext", "managed" );
+ session.setDependencyManager( depMgmt );
+
+ expected = parser.parseResource( "transitive-of-transitive-of-root.txt" );
+
+ request = new CollectRequest( root, Arrays.asList( repository ) );
+ result = collector.collectDependencies( session, request );
+
+ assertEqualSubtree( expected, result.getRoot() );
+
+ depMgmt = new TestDependencyManager();
+ depMgmt.scope( "gid:transitive-of-root:ext", "managed" );
+ session.setDependencyManager( depMgmt );
+
+ expected = parser.parseResource( "transitive-of-root.txt" );
+
+ request = new CollectRequest( root, Arrays.asList( repository ) );
+ result = collector.collectDependencies( session, request );
+
+ assertEqualSubtree( expected, result.getRoot() );
+
+ depMgmt = new TestDependencyManager();
+ depMgmt.scope( "gid:direct-of-root:ext", "managed" );
+ session.setDependencyManager( depMgmt );
+
+ expected = parser.parseResource( "direct-of-root.txt" );
+
+ request = new CollectRequest( root, Arrays.asList( repository ) );
+ result = collector.collectDependencies( session, request );
+
+ assertEqualSubtree( expected, result.getRoot() );
+
+ // Tests managed optionality is processed by selector.
+ depMgmt = new TestDependencyManager();
+ depMgmt.optional( "gid:transitive-of-transitive-of-root:ext", Boolean.TRUE );
+ session.setDependencyManager( depMgmt );
+
+ expected = parser.parseResource( "transitive-of-transitive-of-root.txt" );
+
+ request = new CollectRequest( root, Arrays.asList( repository ) );
+ result = collector.collectDependencies( session, request );
+
+ assertEqualSubtree( expected, result.getRoot() );
+
+ depMgmt = new TestDependencyManager();
+ depMgmt.optional( "gid:transitive-of-root:ext", Boolean.TRUE );
+ session.setDependencyManager( depMgmt );
+
+ expected = parser.parseResource( "transitive-of-root.txt" );
+
+ request = new CollectRequest( root, Arrays.asList( repository ) );
+ result = collector.collectDependencies( session, request );
+
+ assertEqualSubtree( expected, result.getRoot() );
+
+ depMgmt = new TestDependencyManager();
+ depMgmt.optional( "gid:direct-of-root:ext", Boolean.TRUE );
+ session.setDependencyManager( depMgmt );
+
+ expected = parser.parseResource( "direct-of-root.txt" );
+
+ request = new CollectRequest( root, Arrays.asList( repository ) );
+ result = collector.collectDependencies( session, request );
+
+ assertEqualSubtree( expected, result.getRoot() );
+
+ // Tests managed version is processed by selector.
+ depMgmt = new TestDependencyManager();
+ depMgmt.version( "gid:transitive-of-transitive-of-root:ext", "managed" );
+ session.setDependencyManager( depMgmt );
+
+ expected = parser.parseResource( "transitive-of-transitive-of-root.txt" );
+
+ request = new CollectRequest( root, Arrays.asList( repository ) );
+ result = collector.collectDependencies( session, request );
+
+ assertEqualSubtree( expected, result.getRoot() );
+
+ depMgmt = new TestDependencyManager();
+ depMgmt.version( "gid:transitive-of-root:ext", "managed" );
+ session.setDependencyManager( depMgmt );
+
+ expected = parser.parseResource( "transitive-of-root.txt" );
+
+ request = new CollectRequest( root, Arrays.asList( repository ) );
+ result = collector.collectDependencies( session, request );
+
+ assertEqualSubtree( expected, result.getRoot() );
+
+ depMgmt = new TestDependencyManager();
+ depMgmt.version( "gid:direct-of-root:ext", "managed" );
+ session.setDependencyManager( depMgmt );
+
+ expected = parser.parseResource( "direct-of-root.txt" );
+
+ request = new CollectRequest( root, Arrays.asList( repository ) );
+ result = collector.collectDependencies( session, request );
+
+ assertEqualSubtree( expected, result.getRoot() );
+ }
+
+ @Test
+ public void testSelectionWithScopeDependencySelector()
+ throws DependencyCollectionException, IOException
+ {
+ collector.setArtifactDescriptorReader( newReader( "selection/scope/" ) );
+ parser = new DependencyGraphParser( "artifact-descriptions/selection/scope/" );
+ session.setDependencySelector( null );
+
+ final DependencyNode allNodes = parser.parseResource( "all-nodes.txt" );
+ final DependencyNode transitive1ExclusionTree = parser.parseResource( "transitive-1-exclusion-tree.txt" );
+ final DependencyNode transitive2ExclusionTree = parser.parseResource( "transitive-2-exclusion-tree.txt" );
+ final Dependency root = newDep( "gid:root:ext:ver", "root-scope" );
+ final CollectRequest request = new CollectRequest( root, Arrays.asList( repository ) );
+ CollectResult result = collector.collectDependencies( session, request );
+ assertEqualSubtree( allNodes, result.getRoot() );
+
+ /*
+ A dependency selector that filters transitive dependencies based on their scope. Direct dependencies are always
+ included regardless of their scope.
+ */
+ // Include all.
+ this.session.setDependencySelector( new ScopeDependencySelector() );
+ result = collector.collectDependencies( session, request );
+ assertEqualSubtree( allNodes, result.getRoot() );
+
+ // Exclude root scope equals include all as the root is always included.
+ this.session.setDependencySelector( new ScopeDependencySelector( "root-scope" ) );
+ result = collector.collectDependencies( session, request );
+ assertEqualSubtree( allNodes, result.getRoot() );
+
+ // Exclude direct scope equals include all as direct dependencies are always included.
+ this.session.setDependencySelector( new ScopeDependencySelector( "direct-scope" ) );
+ result = collector.collectDependencies( session, request );
+ assertEqualSubtree( allNodes, result.getRoot() );
+
+ // Exclude scope of transitive of direct.
+ this.session.setDependencySelector( new ScopeDependencySelector( "transitive-1-scope" ) );
+ result = collector.collectDependencies( session, request );
+ assertEqualSubtree( transitive1ExclusionTree, result.getRoot() );
+
+ // Exclude scope of transitive of transitive of direct dependency.
+ this.session.setDependencySelector( new ScopeDependencySelector( "transitive-2-scope" ) );
+ result = collector.collectDependencies( session, request );
+ assertEqualSubtree( transitive2ExclusionTree, result.getRoot() );
+
+ // Same test as above but with root artifact instead of root dependency.
+ this.session.setDependencySelector( null );
+ final CollectRequest rootArtifactRequest = new CollectRequest();
+ rootArtifactRequest.setRootArtifact( new DefaultArtifact( "gid:root:ext:ver" ) );
+ rootArtifactRequest.addDependency( newDep( "gid:direct:ext:ver", "direct-scope" ) );
+ rootArtifactRequest.setRepositories( Arrays.asList( repository ) );
+
+ result = collector.collectDependencies( session, rootArtifactRequest );
+ assertNull( result.getRoot().getDependency() );
+ assertEqualSubtree( allNodes, toDependencyResult( result.getRoot(), "root-scope", null ) );
+
+ /*
+ A dependency selector that filters transitive dependencies based on their scope. Direct dependencies are always
+ included regardless of their scope.
+ */
+ // Include all.
+ this.session.setDependencySelector( new ScopeDependencySelector() );
+ result = collector.collectDependencies( session, rootArtifactRequest );
+ assertNull( result.getRoot().getDependency() );
+ assertEqualSubtree( allNodes, toDependencyResult( result.getRoot(), "root-scope", null ) );
+
+ // Exclude direct scope equals include all as direct dependencies are always included.
+ this.session.setDependencySelector( new ScopeDependencySelector( "direct-scope" ) );
+ result = collector.collectDependencies( session, rootArtifactRequest );
+ assertNull( result.getRoot().getDependency() );
+ assertEqualSubtree( allNodes, toDependencyResult( result.getRoot(), "root-scope", null ) );
+
+ // Exclude scope of transitive of direct.
+ this.session.setDependencySelector( new ScopeDependencySelector( "transitive-1-scope" ) );
+ result = collector.collectDependencies( session, rootArtifactRequest );
+ assertNull( result.getRoot().getDependency() );
+ assertEqualSubtree( transitive1ExclusionTree, toDependencyResult( result.getRoot(), "root-scope", null ) );
+
+ // Exclude scope of transitive of transitive of direct dependency.
+ this.session.setDependencySelector( new ScopeDependencySelector( "transitive-2-scope" ) );
+ result = collector.collectDependencies( session, rootArtifactRequest );
+ assertNull( result.getRoot().getDependency() );
+ assertEqualSubtree( transitive2ExclusionTree, toDependencyResult( result.getRoot(), "root-scope", null ) );
+ }
+
+ @Test
+ public void testSelectionWithOptionalDependencySelector()
+ throws DependencyCollectionException, IOException
+ {
+ collector.setArtifactDescriptorReader( newReader( "selection/optional/" ) );
+ parser = new DependencyGraphParser( "artifact-descriptions/selection/optional/" );
+ session.setDependencySelector( null );
+
+ final DependencyNode allNodes = parser.parseResource( "all-nodes.txt" );
+ final DependencyNode optionalTransitiveExclusionTree =
+ parser.parseResource( "optional-transitive-exclusion-tree.txt" );
+
+ final Dependency root = newDep( "gid:root:ext:ver", "root-scope" ).setOptional( true );
+ // No selector. Include all.
+ final CollectRequest request = new CollectRequest( root, Arrays.asList( repository ) );
+ CollectResult result = collector.collectDependencies( session, request );
+ assertEqualSubtree( allNodes, result.getRoot() );
+
+ // A dependency selector that excludes transitive optional dependencies.
+ this.session.setDependencySelector( new OptionalDependencySelector() );
+ result = collector.collectDependencies( session, request );
+ assertEqualSubtree( optionalTransitiveExclusionTree, result.getRoot() );
+
+ // Same test as above but with root artifact instead of root dependency.
+ this.session.setDependencySelector( null );
+ final Artifact rootArtifact = new DefaultArtifact( "gid:root:ext:ver" );
+ final CollectRequest rootArtifactRequest = new CollectRequest();
+ rootArtifactRequest.setRootArtifact( rootArtifact );
+ rootArtifactRequest.addDependency( newDep( "gid:direct:ext:ver", "direct-scope" ).setOptional( true ) );
+ result = collector.collectDependencies( session, rootArtifactRequest );
+ assertNull( result.getRoot().getDependency() );
+ assertEqualSubtree( allNodes, toDependencyResult( result.getRoot(), "root-scope", true ) );
+
+ // A dependency selector that excludes transitive optional dependencies.
+ this.session.setDependencySelector( new OptionalDependencySelector() );
+ result = collector.collectDependencies( session, rootArtifactRequest );
+ assertNull( result.getRoot().getDependency() );
+ assertEqualSubtree( optionalTransitiveExclusionTree,
+ toDependencyResult( result.getRoot(), "root-scope", true ) );
+ }
+
private DependencyNode toDependencyResult( final DependencyNode root, final String rootScope,
final Boolean optional )
{
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/all-nodes.txt b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/all-nodes.txt
new file mode 100644
index 0000000..6caeee1
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/all-nodes.txt
@@ -0,0 +1,4 @@
+gid:root:ext:ver root-scope
++- gid:direct-of-root:ext:ver direct-of-root-scope
+ +- gid:transitive-of-root:ext:ver transitive-of-root-scope
+ +- gid:transitive-of-transitive-of-root:ext:ver transitive-of-transitive-of-root-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/direct-of-root.txt b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/direct-of-root.txt
new file mode 100644
index 0000000..e7b354d
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/direct-of-root.txt
@@ -0,0 +1 @@
+gid:root:ext:ver root-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_direct-of-root_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_direct-of-root_ver.ini
new file mode 100644
index 0000000..a801f3f
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_direct-of-root_ver.ini
@@ -0,0 +1,2 @@
+[dependencies]
+gid:transitive-of-root:ext:ver:transitive-of-root-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_root_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_root_ver.ini
new file mode 100644
index 0000000..37fe9ac
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_root_ver.ini
@@ -0,0 +1,2 @@
+[dependencies]
+gid:direct-of-root:ext:ver:direct-of-root-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_transitive-of-root_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_transitive-of-root_ver.ini
new file mode 100644
index 0000000..e34fa04
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_transitive-of-root_ver.ini
@@ -0,0 +1,2 @@
+[dependencies]
+gid:transitive-of-transitive-of-root:ext:ver:transitive-of-transitive-of-root-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_transitive-of-transitive-of-root_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_transitive-of-transitive-of-root_ver.ini
new file mode 100644
index 0000000..61a252c
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/gid_transitive-of-transitive-of-root_ver.ini
@@ -0,0 +1 @@
+[dependencies]
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/transitive-of-root.txt b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/transitive-of-root.txt
new file mode 100644
index 0000000..dbee99b
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/transitive-of-root.txt
@@ -0,0 +1,2 @@
+gid:root:ext:ver root-scope
++- gid:direct-of-root:ext:ver direct-of-root-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/transitive-of-transitive-of-root.txt b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/transitive-of-transitive-of-root.txt
new file mode 100644
index 0000000..ef3dc74
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/managed/transitive-of-transitive-of-root.txt
@@ -0,0 +1,3 @@
+gid:root:ext:ver root-scope
++- gid:direct-of-root:ext:ver direct-of-root-scope
+ +- gid:transitive-of-root:ext:ver transitive-of-root-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/all-nodes.txt b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/all-nodes.txt
new file mode 100644
index 0000000..89de14f
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/all-nodes.txt
@@ -0,0 +1,4 @@
+gid:root:ext:ver root-scope optional
++- gid:direct:ext:ver direct-scope optional
+ +- gid:transitive-1:ext:ver transitive-1-scope optional
+ +- gid:transitive-2:ext:ver transitive-2-scope optional
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_direct_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_direct_ver.ini
new file mode 100644
index 0000000..0bcf1f8
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_direct_ver.ini
@@ -0,0 +1,2 @@
+[dependencies]
+gid:transitive-1:ext:ver:transitive-1-scope:optional
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_root_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_root_ver.ini
new file mode 100644
index 0000000..a7e6ac1
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_root_ver.ini
@@ -0,0 +1,2 @@
+[dependencies]
+gid:direct:ext:ver:direct-scope:optional
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_transitive-1_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_transitive-1_ver.ini
new file mode 100644
index 0000000..7428741
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_transitive-1_ver.ini
@@ -0,0 +1,2 @@
+[dependencies]
+gid:transitive-2:ext:ver:transitive-2-scope:optional
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_transitive-2_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_transitive-2_ver.ini
new file mode 100644
index 0000000..61a252c
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/gid_transitive-2_ver.ini
@@ -0,0 +1 @@
+[dependencies]
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/optional-transitive-exclusion-tree.txt b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/optional-transitive-exclusion-tree.txt
new file mode 100644
index 0000000..34fa909
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/optional/optional-transitive-exclusion-tree.txt
@@ -0,0 +1,2 @@
+gid:root:ext:ver root-scope optional
++- gid:direct:ext:ver direct-scope optional
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/all-nodes.txt b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/all-nodes.txt
new file mode 100644
index 0000000..8bec12e
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/all-nodes.txt
@@ -0,0 +1,4 @@
+gid:root:ext:ver root-scope
++- gid:direct:ext:ver direct-scope
+ +- gid:transitive-1:ext:ver transitive-1-scope
+ +- gid:transitive-2:ext:ver transitive-2-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_direct_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_direct_ver.ini
new file mode 100644
index 0000000..aad5f7a
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_direct_ver.ini
@@ -0,0 +1,2 @@
+[dependencies]
+gid:transitive-1:ext:ver:transitive-1-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_root_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_root_ver.ini
new file mode 100644
index 0000000..175e571
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_root_ver.ini
@@ -0,0 +1,2 @@
+[dependencies]
+gid:direct:ext:ver:direct-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_transitive-1_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_transitive-1_ver.ini
new file mode 100644
index 0000000..56b4533
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_transitive-1_ver.ini
@@ -0,0 +1,2 @@
+[dependencies]
+gid:transitive-2:ext:ver:transitive-2-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_transitive-2_ver.ini b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_transitive-2_ver.ini
new file mode 100644
index 0000000..61a252c
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/gid_transitive-2_ver.ini
@@ -0,0 +1 @@
+[dependencies]
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/transitive-1-exclusion-tree.txt b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/transitive-1-exclusion-tree.txt
new file mode 100644
index 0000000..509afac
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/transitive-1-exclusion-tree.txt
@@ -0,0 +1,2 @@
+gid:root:ext:ver root-scope
++- gid:direct:ext:ver direct-scope
diff --git a/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/transitive-2-exclusion-tree.txt b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/transitive-2-exclusion-tree.txt
new file mode 100644
index 0000000..b3b0563
--- /dev/null
+++ b/maven-resolver-impl/src/test/resources/artifact-descriptions/selection/scope/transitive-2-exclusion-tree.txt
@@ -0,0 +1,3 @@
+gid:root:ext:ver root-scope
++- gid:direct:ext:ver direct-scope
+ +- gid:transitive-1:ext:ver transitive-1-scope
[maven-resolver] 01/03: [MRESOLVER-8] ScopeDependencySelector
incorrectly de-selects direct dependencies
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRESOLVER-8+9+12
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 3d4abdbe74342416ce7b6d84ec8e902af453c62a
Author: Christian Schulte <cs...@schulte.it>
AuthorDate: Sat Mar 11 22:38:14 2017 +0100
[MRESOLVER-8] ScopeDependencySelector incorrectly de-selects direct dependencies
---
.../graph/selector/ScopeDependencySelector.java | 40 ++++++++--------------
1 file changed, 15 insertions(+), 25 deletions(-)
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java
index 127fdf3..c812d1b 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.util.graph.selector;
* 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
@@ -34,14 +34,14 @@ import org.eclipse.aether.graph.Dependency;
* A dependency selector that filters transitive dependencies based on their scope. Direct dependencies are always
* included regardless of their scope. <em>Note:</em> This filter does not assume any relationships between the scopes.
* In particular, the filter is not aware of scopes that logically include other scopes.
- *
+ *
* @see Dependency#getScope()
*/
public final class ScopeDependencySelector
implements DependencySelector
{
- private final boolean transitive;
+ private final int depth;
private final Collection<String> included;
@@ -49,13 +49,13 @@ public final class ScopeDependencySelector
/**
* Creates a new selector using the specified includes and excludes.
- *
+ *
* @param included The set of scopes to include, may be {@code null} or empty to include any scope.
* @param excluded The set of scopes to exclude, may be {@code null} or empty to exclude no scope.
*/
public ScopeDependencySelector( Collection<String> included, Collection<String> excluded )
{
- transitive = false;
+ this.depth = 0;
this.included = clone( included );
this.excluded = clone( excluded );
}
@@ -82,7 +82,7 @@ public final class ScopeDependencySelector
/**
* Creates a new selector using the specified excludes.
- *
+ *
* @param excluded The set of scopes to exclude, may be {@code null} or empty to exclude no scope.
*/
public ScopeDependencySelector( String... excluded )
@@ -90,33 +90,23 @@ public final class ScopeDependencySelector
this( null, ( excluded != null ) ? Arrays.asList( excluded ) : null );
}
- private ScopeDependencySelector( boolean transitive, Collection<String> included, Collection<String> excluded )
+ private ScopeDependencySelector( int depth, Collection<String> included, Collection<String> excluded )
{
- this.transitive = transitive;
+ this.depth = depth;
this.included = included;
this.excluded = excluded;
}
public boolean selectDependency( Dependency dependency )
{
- if ( !transitive )
- {
- return true;
- }
-
- String scope = dependency.getScope();
- return ( included == null || included.contains( scope ) )
- && ( excluded == null || !excluded.contains( scope ) );
+ return depth < 2
+ || ( ( included == null || included.contains( dependency.getScope() ) )
+ && ( excluded == null || !excluded.contains( dependency.getScope() ) ) );
}
public DependencySelector deriveChildSelector( DependencyCollectionContext context )
{
- if ( this.transitive || context.getDependency() == null )
- {
- return this;
- }
-
- return new ScopeDependencySelector( true, included, excluded );
+ return depth >= 2 ? this : new ScopeDependencySelector( depth + 1, included, excluded );
}
@Override
@@ -132,7 +122,7 @@ public final class ScopeDependencySelector
}
ScopeDependencySelector that = (ScopeDependencySelector) obj;
- return transitive == that.transitive && Objects.equals( included, that.included )
+ return depth == that.depth && Objects.equals( included, that.included )
&& Objects.equals( excluded, that.excluded );
}
@@ -140,7 +130,7 @@ public final class ScopeDependencySelector
public int hashCode()
{
int hash = 17;
- hash = hash * 31 + ( transitive ? 1 : 0 );
+ hash = hash * 31 + depth;
hash = hash * 31 + ( included != null ? included.hashCode() : 0 );
hash = hash * 31 + ( excluded != null ? excluded.hashCode() : 0 );
return hash;
[maven-resolver] 02/03: [MRESOLVER-9] DefaultDependencyCollector
does not correctly handle dependency management
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRESOLVER-8+9+12
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 55a95175c66d21bb8292913f3f441e3080a632cd
Author: Christian Schulte <cs...@schulte.it>
AuthorDate: Sat Mar 11 22:39:20 2017 +0100
[MRESOLVER-9] DefaultDependencyCollector does not correctly handle dependency management
---
.../internal/impl/collect/DefaultDependencyCollector.java | 10 +++++-----
.../internal/impl/collect/DefaultDependencyCollectorTest.java | 6 +-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
index 9d37435..52fda64 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
@@ -433,16 +433,16 @@ public class DefaultDependencyCollector
Args args = context.getArgs();
Results results = context.getResults();
- if ( context.getDepSelector() != null && !context.getDepSelector().selectDependency( dc.origDependency ) )
- {
- return null;
- }
-
PremanagedDependency preManaged =
PremanagedDependency.create( context.getDepManager(), dc.origDependency, dc.disableVersionManagement,
args.premanagedState );
Dependency dependency = preManaged.managedDependency;
+ if ( context.getDepSelector() != null && !context.getDepSelector().selectDependency( dependency ) )
+ {
+ return null;
+ }
+
boolean noDescriptor = isLackingDescriptor( dependency.getArtifact() );
boolean traverse = !noDescriptor
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
index 88ced9f..d4a0ee0 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
@@ -571,10 +571,6 @@ public class DefaultDependencyCollectorTest
/**
* Tests that scope based dependency selection happens before dependency management.
- * <p>
- * This is not really correct (see MRESOLVER-9), but there are a number of tests
- * in the Maven and Maven Integration Testing projects that currently rely on this
- * behaviour.
*/
@Test
public void testSelectionBeforeManagement()
@@ -604,7 +600,7 @@ public class DefaultDependencyCollectorTest
// With proper dependency management, the test scope of aid3 would
// be managed to compile, and we would get another child.
// Currently, the dependency gets filtered by ScopeDependencyManager.
- assertEquals( 0, childLevel1.getChildren().size() );
+ assertEquals( 1, childLevel1.getChildren().size() );
}
static class TestDependencyManager