WIP

Author: cstamas

shared/pom.xml

@@ -30,6 +30,20 @@
       <groupId>eu.maveniverse.maven.mima</groupId>
       <artifactId>context</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>

shared/src/main/java/eu/maveniverse/maven/toolbox/shared/Toolbox.java

@@ -14,28 +14,34 @@
 import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.ArtifactResult;
 import org.eclipse.aether.util.artifact.JavaScopes;
+import org.eclipse.aether.util.filter.ScopeDependencyFilter;
 
 public interface Toolbox {
     enum ResolutionScope {
         COMPILE(
-                Arrays.asList(JavaScopes.RUNTIME, JavaScopes.TEST),
-                ScopeDependencySelector.fromRoot(null, Arrays.asList(JavaScopes.RUNTIME, JavaScopes.TEST))),
-        COMPILE_PLUS_RUNTIME(
-                Collections.singletonList(JavaScopes.TEST),
-                ScopeDependencySelector.fromRoot(null, Collections.singletonList(JavaScopes.TEST))),
+                Collections.emptyList(),
+                ScopeDependencySelector.fromDirect(null, Arrays.asList(JavaScopes.RUNTIME, JavaScopes.TEST)),
+                new ScopeDependencyFilter(null, Arrays.asList(JavaScopes.RUNTIME, JavaScopes.TEST))),
         RUNTIME(
                 Arrays.asList(JavaScopes.PROVIDED, JavaScopes.TEST),
-                ScopeDependencySelector.fromRoot(null, Arrays.asList(JavaScopes.PROVIDED, JavaScopes.TEST))),
+                ScopeDependencySelector.fromRoot(null, Arrays.asList(JavaScopes.PROVIDED, JavaScopes.TEST)),
+                null),
         TEST(
                 Collections.emptyList(),
-                ScopeDependencySelector.fromDirect(null, Arrays.asList(JavaScopes.PROVIDED, JavaScopes.TEST)));
+                ScopeDependencySelector.fromDirect(null, Arrays.asList(JavaScopes.PROVIDED, JavaScopes.TEST)),
+                null);
 
         private final List<String> directExcludedScopes;
         private final ScopeDependencySelector scopeDependencySelector;
+        private final ScopeDependencyFilter scopeDependencyFilter;
 
-        ResolutionScope(List<String> directExcludedScopes, ScopeDependencySelector scopeDependencySelector) {
+        ResolutionScope(
+                List<String> directExcludedScopes,
+                ScopeDependencySelector scopeDependencySelector,
+                ScopeDependencyFilter scopeDependencyFilter) {
             this.directExcludedScopes = Collections.unmodifiableList(new ArrayList<>(directExcludedScopes));
             this.scopeDependencySelector = scopeDependencySelector;
+            this.scopeDependencyFilter = scopeDependencyFilter;
         }
 
         public List<String> getDirectExcludedScopes() {
@@ -45,6 +51,10 @@ public List<String> getDirectExcludedScopes() {
         public ScopeDependencySelector getScopeDependencySelector() {
             return scopeDependencySelector;
         }
+
+        public ScopeDependencyFilter getScopeDependencyFilter() {
+            return scopeDependencyFilter;
+        }
     }
 
     /**

shared/src/main/java/eu/maveniverse/maven/toolbox/shared/internal/ToolboxImpl.java

@@ -23,6 +23,8 @@
 import org.eclipse.aether.util.graph.selector.AndDependencySelector;
 import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
 import org.eclipse.aether.util.graph.transformer.ConflictResolver;
+import org.eclipse.aether.util.graph.visitor.CloningDependencyVisitor;
+import org.eclipse.aether.util.graph.visitor.FilteringDependencyVisitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +70,15 @@ public CollectResult collectAsProject(
         collectRequest.setTrace(RequestTrace.newChild(null, collectRequest));
 
         logger.debug("Collecting {}", collectRequest);
-        return repositorySystem.collectDependencies(session, collectRequest);
+        CollectResult result = repositorySystem.collectDependencies(session, collectRequest);
+        if (resolutionScope.getScopeDependencyFilter() != null) {
+            CloningDependencyVisitor cloning = new CloningDependencyVisitor();
+            FilteringDependencyVisitor filter =
+                    new FilteringDependencyVisitor(cloning, resolutionScope.getScopeDependencyFilter());
+            result.getRoot().accept(filter);
+            result.setRoot(cloning.getRootNode());
+        }
+        return result;
     }
 
     @Override
@@ -100,7 +110,15 @@ public CollectResult collectAsDependency(
         collectRequest.setTrace(RequestTrace.newChild(null, collectRequest));
 
         logger.debug("Collecting {}", collectRequest);
-        return repositorySystem.collectDependencies(session, collectRequest);
+        CollectResult result = repositorySystem.collectDependencies(session, collectRequest);
+        if (resolutionScope.getScopeDependencyFilter() != null) {
+            CloningDependencyVisitor cloning = new CloningDependencyVisitor();
+            FilteringDependencyVisitor filter =
+                    new FilteringDependencyVisitor(cloning, resolutionScope.getScopeDependencyFilter());
+            result.getRoot().accept(filter);
+            result.setRoot(cloning.getRootNode());
+        }
+        return result;
     }
 
     @Override