Add POMs to resolve/resolve-transitive (#325)

Add POMs to resolve/resolve-transitive

Fixes #321

Author: cstamas

it/toolbox-cli-its/pom.xml

@@ -95,6 +95,7 @@
                 <script>${itDir}/identify-1/it.groovy</script>
                 <script>${itDir}/identify-2/it.groovy</script>
                 <script>${itDir}/noarg-1/it.groovy</script>
+                <script>${itDir}/resolve-1/it.groovy</script>
                 <!-- fails often, relies heavily on search-api CSC backend -->
                 <!--script>${itDir}/libyear-1/it.groovy</script-->
               </scripts>

it/toolbox-cli-its/src/it/resolve-1/it.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2023-2024 Maveniverse Org.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+StringBuilder out = new StringBuilder()
+StringBuilder err = new StringBuilder()
+String[] args = ["${java}", '-jar', "${cli}", "-e", "resolve", "junit:junit:4.13.2", "--poms"]
+
+ProcessBuilder proc = new ProcessBuilder(args)
+Process process = proc.start()
+process.consumeProcessOutput(out, err)
+process.waitFor()
+
+// this is junit:junit:pom:4.13.2 sha-512 hash:
+assert out.contains("SHA-512: abf1cf90ab6a525ae0cfa5235563b00bc6ef07c59f8cdd5c5495ea8b14941b5803a3f7adffaa36ec37152a7904a10e04939c0d11b48115f1943a1606cc5066c0")
+// this is junit:junit:jar:4.13.2 sha-512 hash:
+assert out.contains("SHA-512: a31b9950f929a7e5a600d89787ef40e42a8a8e2392e210d0c0f45b3572937670a18a524f1815508cd1152cd1eaa7275cb7430ba45c053be365c83c231bccd3f0")

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

@@ -353,7 +353,12 @@ public RecordStats(boolean active, int recordedCount) {
      * Resolves given artifacts.
      */
     Result<List<Artifact>> resolve(
-            Source<Artifact> artifacts, boolean sources, boolean javadoc, boolean signature, Sink<Artifact> sink)
+            Source<Artifact> artifacts,
+            boolean poms,
+            boolean sources,
+            boolean javadoc,
+            boolean signature,
+            Sink<Artifact> sink)
             throws Exception;
 
     /**
@@ -362,6 +367,7 @@ Result<List<Artifact>> resolve(
     Result<List<Artifact>> resolveTransitive(
             ResolutionScope resolutionScope,
             Collection<ResolutionRoot> resolutionRoots,
+            boolean poms,
             boolean sources,
             boolean javadoc,
             boolean signature,

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

@@ -906,21 +906,32 @@ public Result<Path> metadataPath(Metadata metadata, RemoteRepository repository)
 
     @Override
     public Result<List<Artifact>> resolve(
-            Source<Artifact> artifactSource, boolean sources, boolean javadoc, boolean signature, Sink<Artifact> sink)
+            Source<Artifact> artifactSource,
+            boolean poms,
+            boolean sources,
+            boolean javadoc,
+            boolean signature,
+            Sink<Artifact> sink)
             throws Exception {
         List<Artifact> result = new ArrayList<>();
         List<Artifact> artifacts = artifactSource.get().collect(Collectors.toList());
-        output.suggest("Resolving {}", artifacts);
+        output.marker(Output.Verbosity.NORMAL)
+                .emphasize("Resolving ")
+                .outstanding(artifacts.toString())
+                .say();
         try (Sink<Artifact> artifactSink =
                 ArtifactSinks.teeArtifactSink(sink, ArtifactSinks.statArtifactSink(0, true, true, output, this))) {
             List<Artifact> artifactResults = toolboxResolver.resolveArtifacts(artifacts).stream()
                     .map(r -> origin(r.getArtifact(), r.getRepository()))
                     .collect(Collectors.toList());
             result.addAll(artifactResults);
             artifactSink.accept(artifactResults);
-            if (sources || javadoc || signature) {
+            if (poms || sources || javadoc || signature) {
                 HashSet<Artifact> subartifacts = new HashSet<>();
                 artifacts.forEach(a -> {
+                    if (poms && a.getClassifier().isEmpty()) {
+                        subartifacts.add(new SubArtifact(a, "", "pom"));
+                    }
                     if (sources && a.getClassifier().isEmpty()) {
                         subartifacts.add(new SubArtifact(a, "sources", "jar"));
                     }
@@ -958,6 +969,7 @@ public Result<List<Artifact>> resolve(
     public Result<List<Artifact>> resolveTransitive(
             ResolutionScope resolutionScope,
             Collection<ResolutionRoot> resolutionRoots,
+            boolean poms,
             boolean sources,
             boolean javadoc,
             boolean signature,
@@ -969,6 +981,7 @@ public Result<List<Artifact>> resolveTransitive(
                 doResolveTransitive(
                         resolutionScope,
                         resolutionRoot,
+                        poms,
                         sources,
                         javadoc,
                         signature,
@@ -985,6 +998,7 @@ public Result<List<Artifact>> resolveTransitive(
     protected void doResolveTransitive(
             ResolutionScope resolutionScope,
             ResolutionRoot resolutionRoot,
+            boolean poms,
             boolean sources,
             boolean javadoc,
             boolean signature,
@@ -1001,11 +1015,14 @@ protected void doResolveTransitive(
                     .map(r -> origin(r.getArtifact(), r.getRepository()))
                     .collect(Collectors.toList()));
 
-            if (sources || javadoc || signature) {
+            if (poms || sources || javadoc || signature) {
                 HashSet<Artifact> subartifacts = new HashSet<>();
                 dependencyResult.getArtifactResults().stream()
                         .map(r -> origin(r.getArtifact(), r.getRepository()))
                         .forEach(a -> {
+                            if (poms && a.getClassifier().isEmpty()) {
+                                subartifacts.add(new SubArtifact(a, "", "pom"));
+                            }
                             if (sources && a.getClassifier().isEmpty()) {
                                 subartifacts.add(new SubArtifact(a, "sources", "jar"));
                             }

toolbox/src/main/java/eu/maveniverse/maven/toolbox/plugin/gav/GavResolveMojo.java

@@ -32,6 +32,15 @@ public class GavResolveMojo extends GavMojoSupport {
     @Parameter(property = "gav", required = true)
     private String gav;
 
+    /**
+     * Resolve POMs as well (derive coordinates from GAV).
+     */
+    @CommandLine.Option(
+            names = {"--poms"},
+            description = "Resolve POMs as well (derive coordinates from GAV)")
+    @Parameter(property = "poms", defaultValue = "false")
+    private boolean poms;
+
     /**
      * Resolve sources JAR as well (derive coordinates from GAV).
      */
@@ -74,6 +83,7 @@ protected Result<List<Artifact>> doExecute() throws Exception {
         ToolboxCommando toolboxCommando = getToolboxCommando();
         return toolboxCommando.resolve(
                 () -> slurp(gav).stream().map(DefaultArtifact::new),
+                poms,
                 sources,
                 javadoc,
                 signature,

toolbox/src/main/java/eu/maveniverse/maven/toolbox/plugin/gav/GavResolveTransitiveMojo.java

@@ -52,6 +52,15 @@ public class GavResolveTransitiveMojo extends GavMojoSupport {
     @Parameter(property = "boms")
     private String boms;
 
+    /**
+     * Resolve POMs as well (derive coordinates from GAV).
+     */
+    @CommandLine.Option(
+            names = {"--poms"},
+            description = "Resolve POMs as well (derive coordinates from GAV)")
+    @Parameter(property = "poms", defaultValue = "false")
+    private boolean poms;
+
     /**
      * Resolve sources JAR as well (derive coordinates from GAV).
      */
@@ -95,6 +104,7 @@ protected Result<List<Artifact>> doExecute() throws Exception {
         return toolboxCommando.resolveTransitive(
                 ResolutionScope.parse(scope),
                 toolboxCommando.loadGavs(slurp(gav), slurp(boms)),
+                poms,
                 sources,
                 javadoc,
                 signature,

toolbox/src/main/java/eu/maveniverse/maven/toolbox/plugin/mp/PluginResolveMojo.java

@@ -24,6 +24,12 @@
  */
 @Mojo(name = "plugin-resolve", threadSafe = true)
 public class PluginResolveMojo extends MPPluginMojoSupport {
+    /**
+     * Resolve POMs as well (derive coordinates from GAV).
+     */
+    @Parameter(property = "poms", defaultValue = "false")
+    private boolean poms;
+
     /**
      * Resolve sources JAR as well (derive coordinates from GAV).
      */
@@ -61,6 +67,6 @@ protected Result<List<Artifact>> doExecute() throws Exception {
                     .collect(Collectors.toList());
         }
         return toolboxCommando.resolve(
-                roots::stream, sources, javadoc, signature, toolboxCommando.artifactSink(sinkSpec, dryRun));
+                roots::stream, poms, sources, javadoc, signature, toolboxCommando.artifactSink(sinkSpec, dryRun));
     }
 }

toolbox/src/main/java/eu/maveniverse/maven/toolbox/plugin/mp/PluginResolveTransitiveMojo.java

@@ -30,6 +30,12 @@ public class PluginResolveTransitiveMojo extends MPPluginMojoSupport {
     @Parameter(property = "scope", defaultValue = "runtime", required = true)
     private String scope;
 
+    /**
+     * Resolve POMs as well (derive coordinates from GAV).
+     */
+    @Parameter(property = "poms", defaultValue = "false")
+    private boolean poms;
+
     /**
      * Resolve sources JAR as well (derive coordinates from GAV).
      */
@@ -67,6 +73,7 @@ protected Result<List<Artifact>> doExecute() throws Exception {
         return toolboxCommando.resolveTransitive(
                 ResolutionScope.parse(scope),
                 roots,
+                poms,
                 sources,
                 javadoc,
                 signature,

toolbox/src/main/java/eu/maveniverse/maven/toolbox/plugin/mp/ResolveMojo.java

@@ -26,6 +26,12 @@ public class ResolveMojo extends MPMojoSupport {
     @Parameter(property = "depSpec", defaultValue = "any()")
     private String depSpec;
 
+    /**
+     * Resolve POMs as well (derive coordinates from GAV).
+     */
+    @Parameter(property = "poms", defaultValue = "false")
+    private boolean poms;
+
     /**
      * Resolve sources JAR as well (derive coordinates from GAV).
      */
@@ -57,6 +63,7 @@ protected Result<List<Artifact>> doExecute() throws Exception {
                 () -> projectAsResolutionRoot().getDependencies().stream()
                         .filter(toolboxCommando.parseDependencyMatcherSpec(depSpec))
                         .map(toolboxCommando::toArtifact),
+                poms,
                 sources,
                 javadoc,
                 signature,

toolbox/src/main/java/eu/maveniverse/maven/toolbox/plugin/mp/ResolveTransitiveMojo.java

@@ -33,6 +33,12 @@ public class ResolveTransitiveMojo extends MPMojoSupport {
     @Parameter(property = "depSpec", defaultValue = "any()")
     private String depSpec;
 
+    /**
+     * Resolve POMs as well (derive coordinates from GAV).
+     */
+    @Parameter(property = "poms", defaultValue = "false")
+    private boolean poms;
+
     /**
      * Resolve sources JAR as well (derive coordinates from GAV).
      */
@@ -64,6 +70,7 @@ protected Result<List<Artifact>> doExecute() throws Exception {
         return toolboxCommando.resolveTransitive(
                 resolutionScope,
                 projectDependenciesAsResolutionRoots(toolboxCommando.parseDependencyMatcherSpec(depSpec)),
+                poms,
                 sources,
                 javadoc,
                 signature,